diff options
| -rw-r--r-- | Doc/library/io.rst | 15 | ||||
| -rw-r--r-- | Lib/_pyio.py | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Doc/library/io.rst b/Doc/library/io.rst index b0b898d..cfd1af5 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -505,8 +505,9 @@ Buffered Streams The constructor creates a :class:`BufferedWriter` for the given writeable *raw* stream. If the *buffer_size* is not given, it defaults to - :data:`DEFAULT_BUFFER_SIZE`. If *max_buffer_size* is omitted, it defaults to - twice the buffer size. + :data:`DEFAULT_BUFFER_SIZE`. + + *max_buffer_size* is unused and deprecated. :class:`BufferedWriter` provides or overrides these methods in addition to those from :class:`BufferedIOBase` and :class:`IOBase`: @@ -532,8 +533,9 @@ Buffered Streams *reader* and *writer* are :class:`RawIOBase` objects that are readable and writeable respectively. If the *buffer_size* is omitted it defaults to - :data:`DEFAULT_BUFFER_SIZE`. The *max_buffer_size* (for the buffered writer) - defaults to twice the buffer size. + :data:`DEFAULT_BUFFER_SIZE`. + + *max_buffer_size* is unused and deprecated. :class:`BufferedRWPair` implements all of :class:`BufferedIOBase`\'s methods. @@ -545,8 +547,9 @@ Buffered Streams The constructor creates a reader and writer for a seekable raw stream, given in the first argument. If the *buffer_size* is omitted it defaults to - :data:`DEFAULT_BUFFER_SIZE`. The *max_buffer_size* (for the buffered writer) - defaults to twice the buffer size. + :data:`DEFAULT_BUFFER_SIZE`. + + *max_buffer_size* is unused and deprecated. :class:`BufferedRandom` is capable of anything :class:`BufferedReader` or :class:`BufferedWriter` can do. diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 0bb6c21..c6811db 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -971,9 +971,6 @@ class BufferedWriter(_BufferedIOMixin): if buffer_size <= 0: raise ValueError("invalid buffer size") self.buffer_size = buffer_size - self.max_buffer_size = (2*buffer_size - if max_buffer_size is None - else max_buffer_size) self._write_buf = bytearray() self._write_lock = Lock() @@ -1000,12 +997,12 @@ class BufferedWriter(_BufferedIOMixin): try: self._flush_unlocked() except BlockingIOError as e: - if len(self._write_buf) > self.max_buffer_size: - # We've hit max_buffer_size. We have to accept a - # partial write and cut back our buffer. - overage = len(self._write_buf) - self.max_buffer_size + if len(self._write_buf) > self.buffer_size: + # We've hit the buffer_size. We have to accept a partial + # write and cut back our buffer. + overage = len(self._write_buf) - self.buffer_size written -= overage - self._write_buf = self._write_buf[:self.max_buffer_size] + self._write_buf = self._write_buf[:self.buffer_size] raise BlockingIOError(e.errno, e.strerror, written) return written |