diff options
| author | Guido van Rossum <guido@python.org> | 2002-08-06 17:14:04 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-08-06 17:14:04 (GMT) |
| commit | 8ee524343445f7ac1c60df812deff17a92757c06 (patch) | |
| tree | fc97584832519aed4994015ac2d0c3f1e1555d58 | |
| parent | 97c5fccd773ad509f8fcf6be3708d90c4402772b (diff) | |
| download | cpython-8ee524343445f7ac1c60df812deff17a92757c06.zip cpython-8ee524343445f7ac1c60df812deff17a92757c06.tar.gz cpython-8ee524343445f7ac1c60df812deff17a92757c06.tar.bz2 | |
Mark xreadlines deprecated. Don't use f.xreadlines() in test_iter.py.
| -rw-r--r-- | Lib/test/test_iter.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_xreadline.py | 3 | ||||
| -rw-r--r-- | Modules/xreadlinesmodule.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py index 509ec01..62a8d02 100644 --- 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 db9eb6b..0ba4adc 100644 --- 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 3009768..bf3c091 100644 --- 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'."); } |