mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix failures introduced by buggy merge (2)

Browse source
This commit is contained in:
Antoine Pitrou 2009-03-04 11:18:52 +00:00
parent 7fb111bb9e
commit 1fcadcef40
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/io.py
View file

@ -47,7 +47,7 @@ __author__ = ("Guido van Rossum <guido@python.org>, "
"Mike Verdone <mike.verdone@gmail.com>, " "Mike Verdone <mike.verdone@gmail.com>, "
"Mark Russell <mark.russell@zen.co.uk>, " "Mark Russell <mark.russell@zen.co.uk>, "
"Antoine Pitrou <solipsis@pitrou.net>, " "Antoine Pitrou <solipsis@pitrou.net>, "
"Amaury Forgeotdarc <amauryfa@gmail.com>") "Amaury Forgeot d'Arc <amauryfa@gmail.com>")
__all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO", __all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO",
"BytesIO", "StringIO", "BufferedIOBase", "BytesIO", "StringIO", "BufferedIOBase",

3
Modules/_iobase.c
View file

@ -459,9 +459,6 @@ IOBase_readline(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
if (_PyIOBase_checkClosed(self, Py_True) == NULL)
return NULL;
if (PyObject_HasAttrString(self, "peek")) if (PyObject_HasAttrString(self, "peek"))
has_peek = 1; has_peek = 1;