Commit 1fcadcef authored by Antoine Pitrou's avatar Antoine Pitrou

Fix failures introduced by buggy merge (2)

parent 7fb111bb
......@@ -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",
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment