Mark xreadlines deprecated. Don't use f.xreadlines() in test_iter.py.

diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
index 509ec01b279f3b7a162b5e4a12e231c88695be37..62a8d02f8d106c6961aefe0e2ba194dff18d6ad7 100644 (file)
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -269,7 +269,7 @@ class TestCase(unittest.TestCase):
         try:
             self.assertEqual(list(f), ["0\n", "1\n", "2\n", "3\n", "4\n"])
             f.seek(0, 0)
-            self.assertEqual(list(f.xreadlines()),
+            self.assertEqual(list(f),
                              ["0\n", "1\n", "2\n", "3\n", "4\n"])
         finally:
             f.close()
@@ -302,7 +302,7 @@ class TestCase(unittest.TestCase):
         try:
             self.assertEqual(tuple(f), ("0\n", "1\n", "2\n", "3\n", "4\n"))
             f.seek(0, 0)
-            self.assertEqual(tuple(f.xreadlines()),
+            self.assertEqual(tuple(f),
                              ("0\n", "1\n", "2\n", "3\n", "4\n"))
         finally:
             f.close()

diff --git a/Lib/test/test_xreadline.py b/Lib/test/test_xreadline.py
index db9eb6bd43f69839bd7879bc145661cb5d2dd5ed..0ba4adcb281f9faad216af5b4de1ace4f46316bb 100644 (file)
--- a/Lib/test/test_xreadline.py
+++ b/Lib/test/test_xreadline.py
@@ -1,5 +1,8 @@
 from test.test_support import verbose
 
+import warnings
+warnings.filterwarnings('ignore', "xreadlines", DeprecationWarning)
+
 class XReader:
     def __init__(self):
         self.count = 5

diff --git a/Modules/xreadlinesmodule.c b/Modules/xreadlinesmodule.c
index 3009768192d3aa1413c548ac02acef21fcce85ad..bf3c091df05e74f6948a442533d9baffc790ffb9 100644 (file)
--- a/Modules/xreadlinesmodule.c
+++ b/Modules/xreadlinesmodule.c
@@ -173,4 +173,6 @@ initxreadlines(void)
 {
        XReadlinesObject_Type.ob_type = &PyType_Type;
        Py_InitModule("xreadlines", xreadlines_functions);
+       PyErr_Warn(PyExc_DeprecationWarning,
+                  "xreadlines is deprecated; use 'for line in file'.");
 }