On behalf of Nadeem Vawda: issue #10376: micro-optimize reading from a Zipfile.

(patch by Serhiy)

On behalf of Nadeem Vawda: issue #10376: micro-optimize reading from a Zipfile.
(patch by Serhiy)
78157b3f · Antoine Pitrou · 3861d8b2 · 78157b3f
Commit 78157b3f authored Jun 23, 2012 by Antoine Pitrou
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

Lib/zipfile.py Lib/zipfile.py +10 -8

No files found.
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -733,12 +733,13 @@ class ZipExtFile(io.BufferedIOBase):
                buf += self._read1(self.MAX_N)
            return buf
-        n -= len(self._readbuffer) - self._offset
+        end = n + self._offset
-        if n < 0:
+        if end < len(self._readbuffer):
-            buf = self._readbuffer[self._offset:n]
+            buf = self._readbuffer[self._offset:end]
-            self._offset += len(buf)
+            self._offset = end
            return buf
+        n = end - len(self._readbuffer)
        buf = self._readbuffer[self._offset:]
        self._readbuffer = b''
        self._offset = 0
@@ -774,12 +775,13 @@ class ZipExtFile(io.BufferedIOBase):
            buf += data
            return buf
-        n -= len(self._readbuffer) - self._offset
+        end = n + self._offset
-        if n < 0:
+        if end < len(self._readbuffer):
-            buf = self._readbuffer[self._offset:n]
+            buf = self._readbuffer[self._offset:end]
-            self._offset += len(buf)
+            self._offset = end
            return buf
+        n = end - len(self._readbuffer)
        buf = self._readbuffer[self._offset:]
        self._readbuffer = b''
        self._offset = 0