Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r46033:811906ece2d8
Date: 2011-07-27 18:15 -0700
http://bitbucket.org/pypy/pypy/changeset/811906ece2d8/
Log: merged upstream
diff --git a/pypy/rlib/streamio.py b/pypy/rlib/streamio.py
--- a/pypy/rlib/streamio.py
+++ b/pypy/rlib/streamio.py
@@ -894,13 +894,10 @@
self.buf.append(data)
self.buflen += datalen
elif buflen:
- i = self.bufsize - buflen
- assert i >= 0
- self.buf.append(data[:i])
+ self.buf.append(data)
self.do_write(''.join(self.buf))
self.buf = []
self.buflen = 0
- self.write(data[i:])
else:
self.do_write(data)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
