SF Patch #494863, file.xreadlines() should raise ValueError if file is closed

This makes xreadlines behave like all other file methods
(other than close() which just returns).

diff --git a/Misc/NEWS b/Misc/NEWS
index 8d68533ad0248c8c7752a235ac4ce9372df52291..9ef6912fbd14d485b45c5488a5386d467ddda088 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -6,6 +6,10 @@ Type/class unification and new-style classes
 
 Core and builtins
 
+- file.xreadlines() now raises a ValueError if the file is closed:
+  Previously, an xreadlines object was returned which would raise
+  a ValueError when the xreadlines.next() method was called.
+
 Extension modules
 
 Library

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 27612f491edc78efbcd992939729885d2573c450..9af5ca985cef9d26af3f20ae76d33659d9ef429e 100644 (file)
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -1025,6 +1025,8 @@ file_xreadlines(PyFileObject *f)
 {
        static PyObject* xreadlines_function = NULL;
 
+       if (f->f_fp == NULL)
+               return err_closed();
        if (!xreadlines_function) {
                PyObject *xreadlines_module =
                        PyImport_ImportModule("xreadlines");