[pypy-commit] pypy default: merged upstream

alex_gaynor noreply at buildbot.pypy.org
Thu Jul 28 03:14:55 CEST 2011


Author: Alex Gaynor <alex.gaynor at gmail.com>
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)
 


More information about the pypy-commit mailing list