mirror of
https://github.com/python/cpython.git
synced 2025-12-11 03:20:01 +00:00
Mark xreadlines deprecated. Don't use f.xreadlines() in test_iter.py.
This commit is contained in:
parent
97c5fccd77
commit
8ee5243434
3 changed files with 7 additions and 2 deletions
|
|
@ -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):
|
||||||
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()
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
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)
|
||||||
{
|
{
|
||||||
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'.");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue