commit 1fcadcef408d788b1896ea3d9b4308c1f4c64d12
author Antoine Pitrou <solipsis@pitrou.net> Wed Mar 04 11:18:52 2009 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Wed Mar 04 11:18:52 2009 +0000
tree dc84a82c3f1e20b002657a7430ff9edbe83d53d7
parent 7fb111bb9e53324a622c0cf87fdbaeda288b947a

Fix failures introduced by buggy merge (2)

Lib/io.py

diff --git a/Lib/io.py b/Lib/io.py
index a185a18..978e833 100644
--- 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",

Modules/_iobase.c

diff --git a/Modules/_iobase.c b/Modules/_iobase.c
index 9ee2326..b5fef5b 100644
--- a/Modules/_iobase.c
+++ b/Modules/_iobase.c
@@ -459,9 +459,6 @@
         return NULL;
     }
 
-    if (_PyIOBase_checkClosed(self, Py_True) == NULL)
-        return NULL;
-
     if (PyObject_HasAttrString(self, "peek"))
         has_peek = 1;