mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 80544 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80544 | benjamin.peterson | 2010-04-27 16:01:54 -0500 (Tue, 27 Apr 2010) | 1 line

  reject None as the buffering argument like the C implementation does #8546
........
This commit is contained in:
Benjamin Peterson 2010-04-27 21:07:21 +00:00
parent 06e34a9476
commit 95e392c111
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/_pyio.py
View file

@ -35,7 +35,7 @@ class BlockingIOError(IOError):
self.characters_written = characters_written
def open(file: (str, bytes), mode: str = "r", buffering: int = None,
def open(file: (str, bytes), mode: str = "r", buffering: int = -1,
encoding: str = None, errors: str = None,
newline: str = None, closefd: bool = True) -> "IOBase":
@ -150,7 +150,7 @@ def open(file: (str, bytes), mode: str = "r", buffering: int = None,
raise TypeError("invalid file: %r" % file)
if not isinstance(mode, str):
raise TypeError("invalid mode: %r" % mode)
if buffering is not None and not isinstance(buffering, int):
if not isinstance(buffering, int):
raise TypeError("invalid buffering: %r" % buffering)
if encoding is not None and not isinstance(encoding, str):
raise TypeError("invalid encoding: %r" % encoding)
@ -187,8 +187,6 @@ def open(file: (str, bytes), mode: str = "r", buffering: int = None,
(appending and "a" or "") +
(updating and "+" or ""),
closefd)
if buffering is None:
buffering = -1
line_buffering = False
if buffering == 1 or buffering < 0 and raw.isatty():
buffering = -1