summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-04-27 21:01:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-04-27 21:01:54 (GMT)
commita9bd6d5ea7b822e12fa3c080fe24b04a87bcae56 (patch)
tree5691762d0c9c265d9d5e1fdbad192671e9c8aea2 /Lib
parent1dc6b08f9efe471cc5983cdfcdb391eea505a5e0 (diff)
downloadcpython-a9bd6d5ea7b822e12fa3c080fe24b04a87bcae56.zip
cpython-a9bd6d5ea7b822e12fa3c080fe24b04a87bcae56.tar.gz
cpython-a9bd6d5ea7b822e12fa3c080fe24b04a87bcae56.tar.bz2
reject None as the buffering argument like the C implementation does #8546
Diffstat (limited to 'Lib')
-rw-r--r--Lib/_pyio.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index 8098681..cafc51c 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -40,7 +40,7 @@ class BlockingIOError(IOError):
self.characters_written = characters_written
-def open(file, mode="r", buffering=None,
+def open(file, mode="r", buffering=-1,
encoding=None, errors=None,
newline=None, closefd=True):
@@ -155,7 +155,7 @@ def open(file, mode="r", buffering=None,
raise TypeError("invalid file: %r" % file)
if not isinstance(mode, basestring):
raise TypeError("invalid mode: %r" % mode)
- if buffering is not None and not isinstance(buffering, (int, long)):
+ if not isinstance(buffering, (int, long)):
raise TypeError("invalid buffering: %r" % buffering)
if encoding is not None and not isinstance(encoding, basestring):
raise TypeError("invalid encoding: %r" % encoding)
@@ -192,8 +192,6 @@ def open(file, mode="r", buffering=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