diff options
| author | Georg Brandl <georg@python.org> | 2008-05-17 22:11:54 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-17 22:11:54 (GMT) |
| commit | a9916b55de0e42a4c171ff71972ab9cbce014a77 (patch) | |
| tree | 23a00bd490e7174a6204b6d28249dfff48b135d1 /Objects/fileobject.c | |
| parent | c76ffca2befde942bfa98e3972d5cead572c771a (diff) | |
| download | cpython-a9916b55de0e42a4c171ff71972ab9cbce014a77.zip cpython-a9916b55de0e42a4c171ff71972ab9cbce014a77.tar.gz cpython-a9916b55de0e42a4c171ff71972ab9cbce014a77.tar.bz2 | |
#2353: raise Py3k warning in file.xreadlines().
Diffstat (limited to 'Objects/fileobject.c')
| -rw-r--r-- | Objects/fileobject.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 40ea944..4f8c46b 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -1736,6 +1736,15 @@ file_self(PyFileObject *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 * file_exit(PyObject *f, PyObject *args) { PyObject *ret = PyObject_CallMethod(f, "close", NULL); @@ -1850,9 +1859,9 @@ static PyMethodDef file_methods[] = { #endif {"tell", (PyCFunction)file_tell, METH_NOARGS, tell_doc}, {"readinto", (PyCFunction)file_readinto, METH_VARARGS, readinto_doc}, - {"readlines", (PyCFunction)file_readlines,METH_VARARGS, readlines_doc}, - {"xreadlines",(PyCFunction)file_self, METH_NOARGS, xreadlines_doc}, - {"writelines",(PyCFunction)file_writelines, METH_O, writelines_doc}, + {"readlines", (PyCFunction)file_readlines, METH_VARARGS, readlines_doc}, + {"xreadlines",(PyCFunction)file_xreadlines, METH_NOARGS, xreadlines_doc}, + {"writelines",(PyCFunction)file_writelines, METH_O, writelines_doc}, {"flush", (PyCFunction)file_flush, METH_NOARGS, flush_doc}, {"close", (PyCFunction)file_close, METH_NOARGS, close_doc}, {"isatty", (PyCFunction)file_isatty, METH_NOARGS, isatty_doc}, |