mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#2353: raise Py3k warning in file.xreadlines().

Browse source
This commit is contained in:
Georg Brandl 2008-05-17 22:11:54 +00:00
parent c76ffca2be
commit a9916b55de
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_py3kwarn.py
View file

@ -123,6 +123,13 @@ class TestPy3KWarnings(unittest.TestCase):
with catch_warning() as w: with catch_warning() as w:
self.assertWarning(buffer('a'), w, expected) self.assertWarning(buffer('a'), w, expected)
def test_file_xreadlines(self):
expected = ("f.xreadlines() not supported in 3.x, "
"try 'for line in f' instead")
with file(__file__) as f:
with catch_warning() as w:
self.assertWarning(f.xreadlines(), w, expected)
class TestStdlibRemovals(unittest.TestCase): class TestStdlibRemovals(unittest.TestCase):

2
Misc/NEWS
View file

@ -12,6 +12,8 @@ What's New in Python 2.6 beta 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #2353: file.xreadlines() now emits a Py3k warning.
- Issue #2863: generators now have a ``gen.__name__`` attribute that - Issue #2863: generators now have a ``gen.__name__`` attribute that
equals ``gen.gi_code.co_name``, like ``func.__name___`` that equals equals ``gen.gi_code.co_name``, like ``func.__name___`` that equals
``func.func_code.co_name``. The repr() of a generator now also ``func.func_code.co_name``. The repr() of a generator now also

15
Objects/fileobject.c
View file

@ -1735,6 +1735,15 @@ file_self(PyFileObject *f)
return (PyObject *)f; return (PyObject *)f;
} }
static PyObject *
file_xreadlines(PyFileObject *f)
{
if (PyErr_WarnPy3k("f.xreadlines() not supported in 3.x, "
"try 'for line in f' instead", 1) < 0)
return NULL;
return file_self(f);
}
static PyObject * static PyObject *
file_exit(PyObject *f, PyObject *args) file_exit(PyObject *f, PyObject *args)
{ {
@ -1850,9 +1859,9 @@ static PyMethodDef file_methods[] = {
#endif #endif
{"tell", (PyCFunction)file_tell, METH_NOARGS, tell_doc}, {"tell", (PyCFunction)file_tell, METH_NOARGS, tell_doc},
{"readinto", (PyCFunction)file_readinto, METH_VARARGS, readinto_doc}, {"readinto", (PyCFunction)file_readinto, METH_VARARGS, readinto_doc},
{"readlines", (PyCFunction)file_readlines,METH_VARARGS, readlines_doc}, {"readlines", (PyCFunction)file_readlines, METH_VARARGS, readlines_doc},
{"xreadlines",(PyCFunction)file_self, METH_NOARGS, xreadlines_doc}, {"xreadlines",(PyCFunction)file_xreadlines, METH_NOARGS, xreadlines_doc},
{"writelines",(PyCFunction)file_writelines, METH_O, writelines_doc}, {"writelines",(PyCFunction)file_writelines, METH_O, writelines_doc},
{"flush", (PyCFunction)file_flush, METH_NOARGS, flush_doc}, {"flush", (PyCFunction)file_flush, METH_NOARGS, flush_doc},
{"close", (PyCFunction)file_close, METH_NOARGS, close_doc}, {"close", (PyCFunction)file_close, METH_NOARGS, close_doc},
{"isatty", (PyCFunction)file_isatty, METH_NOARGS, isatty_doc}, {"isatty", (PyCFunction)file_isatty, METH_NOARGS, isatty_doc},