Gregory P. Smith <g...@krypto.org> added the comment: Reviewers: Antoine Pitrou,
Message: Just responding to your comments on the support for generators and non buffer api supporting inputs. I'll get to the other comments in the code soon with new unit tests for those cases. http://codereview.appspot.com/12470/diff/1/2 File Lib/io.py (right): http://codereview.appspot.com/12470/diff/1/2#newcode1055 Line 1055: # b is an iterable of ints, it won't always support len(). On 2009/01/20 11:12:47, Antoine Pitrou wrote: > There is no reason for write() to accept arbitrary iterable of ints, only > bytes-like and buffer-like objects. It will make the code simpler. > Agreed. But since I want to merge this into release30-maint doing that sounds like a behavior change. I'd be fine with removing it for the 3.1/2.7 version of this code (though I hope people will be using the C implementation instead). http://codereview.appspot.com/12470/diff/1/2#newcode1060 Line 1060: # No buffer API? Make intermediate slice copies instead. On 2009/01/20 11:12:47, Antoine Pitrou wrote: > Objects without the buffer API shouldn't be supported at all. Same reason as above. http://codereview.appspot.com/12470/diff/1/3 File Lib/test/test_io.py (right): http://codereview.appspot.com/12470/diff/1/3#newcode496 Line 496: def testWriteNoLengthIterable(self): On 2009/01/20 11:12:47, Antoine Pitrou wrote: > This shouldn't work at all. If it works right now, it is only a side-effect of > the implementation. > (it won't work with FileIO, for example) > hmm in that case it might not be too large of a thing to break when merged into release30-maint. I'll leave that up to the release manager & bdfl. my gut feeling for a release branch change is to say we have to live with this being supported for now. Description: http://bugs.python.org/issue4428 - patch gps04. Please review this at http://codereview.appspot.com/12470 Affected files: Lib/io.py Lib/test/test_io.py Index: Lib/io.py =================================================================== --- Lib/io.py (revision 68796) +++ Lib/io.py (working copy) @@ -1047,11 +1047,42 @@ self._flush_unlocked() except BlockingIOError as e: # We can't accept anything else. - # XXX Why not just let the exception pass through? + # Reraise this with 0 in the written field as none of the + # data passed to this call has been written. raise BlockingIOError(e.errno, e.strerror, 0) before = len(self._write_buf) - self._write_buf.extend(b) - written = len(self._write_buf) - before + bytes_to_consume = self.max_buffer_size - before + # b is an iterable of ints, it won't always support len(). + if hasattr(b, '__len__') and len(b) > bytes_to_consume: + try: + chunk = memoryview(b)[:bytes_to_consume] + except TypeError: + # No buffer API? Make intermediate slice copies instead. + chunk = b[:bytes_to_consume] + # Loop over the data, flushing it to the underlying raw IO + # stream in self.max_buffer_size chunks. + written = 0 + self._write_buf.extend(chunk) + while chunk and len(self._write_buf) > self.buffer_size: + try: + self._flush_unlocked() + except BlockingIOError as e: + written += e.characters_written + raise BlockingIOError(e.errno, e.strerror, written) + written += len(chunk) + assert not self._write_buf, "_write_buf should be empty" + if isinstance(chunk, memoryview): + chunk = memoryview(b)[written: + written + self.max_buffer_size] + else: + chunk = b[written:written + self.max_buffer_size] + self._write_buf.extend(chunk) + else: + # This could go beyond self.max_buffer_size as we don't know + # the length of b. The alternative of iterating over it one + # byte at a time in python would be slow. + self._write_buf.extend(b) + written = len(self._write_buf) - before if len(self._write_buf) > self.buffer_size: try: self._flush_unlocked() Index: Lib/test/test_io.py =================================================================== --- Lib/test/test_io.py (revision 68796) +++ Lib/test/test_io.py (working copy) @@ -479,6 +479,33 @@ self.assertEquals(b"abcdefghijkl", writer._write_stack[0]) + def testWriteMaxBufferSize(self): + writer = MockRawIO() + bufio = io.BufferedWriter(writer, buffer_size=8, max_buffer_size=13) + + bufio.write(b"abcdefghij") + bufio.write(b"klmnopqrstuvwxyz") + bufio.write(b"0123456789"*3) + + expected_writes = [b"abcdefghij", b"klmnopqrstuvw", b"xyz0123456789", + b"0123456789012"] + self.assertEquals(expected_writes, writer._write_stack) + bufio.close() + self.assertEquals(b"3456789", writer._write_stack[4]) + + def testWriteNoLengthIterable(self): + writer = MockRawIO() + bufio = io.BufferedWriter(writer, buffer_size=8) + + def Generator(value): + for x in value: + yield x + iterable = Generator(b'ABCDEFGHIJKLMNOPQRSTUVWXYZ') + self.assertRaises(TypeError, len, iterable) + bufio.write(iterable) + + self.assertEquals(b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', writer._write_stack[0]) + def testWriteNonBlocking(self): raw = MockNonBlockWriterIO((9, 2, 22, -6, 10, 12, 12)) bufio = io.BufferedWriter(raw, 8, 16) _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue5011> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
