Fix failures introduced by buggy merge (2)

pitrou · pitrou · commit 1fcadcef408d · 2009-03-04T11:18:52.000Z
diff --git a/Lib/io.py b/Lib/io.py
@@ -47,7 +47,7 @@
               "Mike Verdone <mike.verdone@gmail.com>, "
               "Mark Russell <mark.russell@zen.co.uk>, "
               "Antoine Pitrou <solipsis@pitrou.net>, "
-              "Amaury Forgeotdarc <amauryfa@gmail.com>")
+              "Amaury Forgeot d'Arc <amauryfa@gmail.com>")
 
 __all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO",
            "BytesIO", "StringIO", "BufferedIOBase",
diff --git a/Modules/_iobase.c b/Modules/_iobase.c
@@ -459,9 +459,6 @@ IOBase_readline(PyObject *self, PyObject *args)
         return NULL;
     }
 
-    if (_PyIOBase_checkClosed(self, Py_True) == NULL)
-        return NULL;
-
     if (PyObject_HasAttrString(self, "peek"))
         has_peek = 1;
 

-Original file line number
+Diff line change
               "Mike Verdone <[email protected]>, "
               "Mark Russell <[email protected]>, "
               "Antoine Pitrou <[email protected]>, "
 -              "Amaury Forgeotdarc <[email protected]>")
 +              "Amaury Forgeot d'Arc <[email protected]>")
 __all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO",
            "BytesIO", "StringIO", "BufferedIOBase",
Original file line number	Diff line number	Diff line change
`@@ -459,9 +459,6 @@ IOBase_readline(PyObject self, PyObject args)`
`459`	`459`	`return NULL;`
`460`	`460`	`}`
`461`	`461`
`462`		`- if (_PyIOBase_checkClosed(self, Py_True) == NULL)`
`463`		`- return NULL;`
`464`		`-`
`465`	`462`	`if (PyObject_HasAttrString(self, "peek"))`
`466`	`463`	`has_peek = 1;`
`467`	`464`