From 1fcadcef408d788b1896ea3d9b4308c1f4c64d12 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 4 Mar 2009 11:18:52 +0000
Subject: Fix failures introduced by buggy merge (2)

---
 Lib/io.py         | 2 +-
 Modules/_iobase.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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 @@ __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 9ee2326..b5fef5b 100644
--- 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;
 
-- 
cgit v0.12