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

nnorwitz · nnorwitz · commit 649b75954a18 · 2002-01-01T19:07:13.000Z
This makes xreadlines behave like all other file methods
(other than close() which just returns).
diff --git 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
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -1025,6 +1025,8 @@ file_xreadlines(PyFileObject *f)`
`1025`	`1025`	`{`
`1026`	`1026`	`static PyObject* xreadlines_function = NULL;`
`1027`	`1027`
	`1028`	`+ if (f->f_fp == NULL)`
	`1029`	`+ return err_closed();`
`1028`	`1030`	`if (!xreadlines_function) {`
`1029`	`1031`	`PyObject *xreadlines_module =`
`1030`	`1032`	`PyImport_ImportModule("xreadlines");`