Commit 8ee52434 authored by Guido van Rossum's avatar Guido van Rossum

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

parent 97c5fccd
...@@ -269,7 +269,7 @@ class TestCase(unittest.TestCase): ...@@ -269,7 +269,7 @@ class TestCase(unittest.TestCase):
try: try:
self.assertEqual(list(f), ["0\n", "1\n", "2\n", "3\n", "4\n"]) self.assertEqual(list(f), ["0\n", "1\n", "2\n", "3\n", "4\n"])
f.seek(0, 0) f.seek(0, 0)
self.assertEqual(list(f.xreadlines()), self.assertEqual(list(f),
["0\n", "1\n", "2\n", "3\n", "4\n"]) ["0\n", "1\n", "2\n", "3\n", "4\n"])
finally: finally:
f.close() f.close()
...@@ -302,7 +302,7 @@ class TestCase(unittest.TestCase): ...@@ -302,7 +302,7 @@ class TestCase(unittest.TestCase):
try: try:
self.assertEqual(tuple(f), ("0\n", "1\n", "2\n", "3\n", "4\n")) self.assertEqual(tuple(f), ("0\n", "1\n", "2\n", "3\n", "4\n"))
f.seek(0, 0) f.seek(0, 0)
self.assertEqual(tuple(f.xreadlines()), self.assertEqual(tuple(f),
("0\n", "1\n", "2\n", "3\n", "4\n")) ("0\n", "1\n", "2\n", "3\n", "4\n"))
finally: finally:
f.close() f.close()
......
from test.test_support import verbose from test.test_support import verbose
import warnings
warnings.filterwarnings('ignore', "xreadlines", DeprecationWarning)
class XReader: class XReader:
def __init__(self): def __init__(self):
self.count = 5 self.count = 5
......
...@@ -173,4 +173,6 @@ initxreadlines(void) ...@@ -173,4 +173,6 @@ initxreadlines(void)
{ {
XReadlinesObject_Type.ob_type = &PyType_Type; XReadlinesObject_Type.ob_type = &PyType_Type;
Py_InitModule("xreadlines", xreadlines_functions); Py_InitModule("xreadlines", xreadlines_functions);
PyErr_Warn(PyExc_DeprecationWarning,
"xreadlines is deprecated; use 'for line in file'.");
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment