Fix failures introduced by buggy merge (2)

diff --git a/Lib/io.py b/Lib/io.py
index a185a18b94bc99b88fdde4cee56c1f4e1e9c3030..978e833c253e288facad21546896e13eb62b3766 100644 (file)
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -47,7 +47,7 @@ __author__ = ("Guido van Rossum <guido@python.org>, "
               "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
index 9ee23264eef28b753982ca9a200526ca615d2756..b5fef5bc77f9c4be47242e6de3388e5d0b7a76cc 100644 (file)
--- 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;