diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-07-23 21:46:35 +0200 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-07-23 21:46:35 +0200 |
commit | 6bb8704af0bf69856b001d9ca000e943b621adaf (patch) | |
tree | b220fb464fcdfc62483f05913c1fa5b678e9e920 /Lib/_pyio.py | |
parent | 6ec3ae2a192c8fa8227ca79da1e96bf22e0f7dec (diff) | |
download | cpython-6bb8704af0bf69856b001d9ca000e943b621adaf.tar.gz |
Issue #12591: Allow io.TextIOWrapper to work with raw IO objects (without
a read1() method), and add an undocumented *write_through* parameter to
mandate unbuffered writes.
Diffstat (limited to 'Lib/_pyio.py')
-rw-r--r-- | Lib/_pyio.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index b79d5fc6c1..78c6d95c23 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -1472,7 +1472,7 @@ class TextIOWrapper(TextIOBase): _CHUNK_SIZE = 2048 def __init__(self, buffer, encoding=None, errors=None, newline=None, - line_buffering=False): + line_buffering=False, write_through=False): if newline is not None and not isinstance(newline, str): raise TypeError("illegal newline type: %r" % (type(newline),)) if newline not in (None, "", "\n", "\r", "\r\n"): @@ -1515,6 +1515,7 @@ class TextIOWrapper(TextIOBase): self._decoded_chars_used = 0 # offset into _decoded_chars for read() self._snapshot = None # info for reconstructing decoder state self._seekable = self._telling = self.buffer.seekable() + self._has_read1 = hasattr(self.buffer, 'read1') if self._seekable and self.writable(): position = self.buffer.tell() @@ -1680,7 +1681,10 @@ class TextIOWrapper(TextIOBase): # len(dec_buffer) bytes ago with decoder state (b'', dec_flags). # Read a chunk, decode it, and put the result in self._decoded_chars. - input_chunk = self.buffer.read1(self._CHUNK_SIZE) + if self._has_read1: + input_chunk = self.buffer.read1(self._CHUNK_SIZE) + else: + input_chunk = self.buffer.read(self._CHUNK_SIZE) eof = not input_chunk self._set_decoded_chars(self._decoder.decode(input_chunk, eof)) |