traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove usage of the deprecated max_buffer_size

This commit is contained in:
Benjamin Peterson 2009-03-05 22:33:59 +00:00
parent 36a30cefd7
commit 394ee00993
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Doc/library/io.rst
View File

@ -505,8 +505,9 @@ Buffered Streams
The constructor creates a :class:`BufferedWriter` for the given writeable The constructor creates a :class:`BufferedWriter` for the given writeable
*raw* stream. If the *buffer_size* is not given, it defaults to *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 :data:`DEFAULT_BUFFER_SIZE`.
twice the buffer size.
*max_buffer_size* is unused and deprecated.
:class:`BufferedWriter` provides or overrides these methods in addition to :class:`BufferedWriter` provides or overrides these methods in addition to
those from :class:`BufferedIOBase` and :class:`IOBase`: those from :class:`BufferedIOBase` and :class:`IOBase`:
@ -532,8 +533,9 @@ Buffered Streams
*reader* and *writer* are :class:`RawIOBase` objects that are readable and *reader* and *writer* are :class:`RawIOBase` objects that are readable and
writeable respectively. If the *buffer_size* is omitted it defaults to writeable respectively. If the *buffer_size* is omitted it defaults to
:data:`DEFAULT_BUFFER_SIZE`. The *max_buffer_size* (for the buffered writer) :data:`DEFAULT_BUFFER_SIZE`.
defaults to twice the buffer size.
*max_buffer_size* is unused and deprecated.
:class:`BufferedRWPair` implements all of :class:`BufferedIOBase`\'s methods. :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 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 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) :data:`DEFAULT_BUFFER_SIZE`.
defaults to twice the buffer size.
*max_buffer_size* is unused and deprecated.
:class:`BufferedRandom` is capable of anything :class:`BufferedReader` or :class:`BufferedRandom` is capable of anything :class:`BufferedReader` or
:class:`BufferedWriter` can do. :class:`BufferedWriter` can do.

13
Lib/_pyio.py
View File

@ -971,9 +971,6 @@ class BufferedWriter(_BufferedIOMixin):
if buffer_size <= 0: if buffer_size <= 0:
raise ValueError("invalid buffer size") raise ValueError("invalid buffer size")
self.buffer_size = 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_buf = bytearray()
self._write_lock = Lock() self._write_lock = Lock()
@ -1000,12 +997,12 @@ class BufferedWriter(_BufferedIOMixin):
try: try:
self._flush_unlocked() self._flush_unlocked()
except BlockingIOError as e: except BlockingIOError as e:
if len(self._write_buf) > self.max_buffer_size: if len(self._write_buf) > self.buffer_size:
# We've hit max_buffer_size. We have to accept a # We've hit the buffer_size. We have to accept a partial
# partial write and cut back our buffer. # write and cut back our buffer.
overage = len(self._write_buf) - self.max_buffer_size overage = len(self._write_buf) - self.buffer_size
written -= overage 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) raise BlockingIOError(e.errno, e.strerror, written)
return written return written