From 78157b3f6fa220177ef595e30f788dfe9b97d850 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 23 Jun 2012 16:44:48 +0200 Subject: [PATCH] On behalf of Nadeem Vawda: issue #10376: micro-optimize reading from a Zipfile. (patch by Serhiy) --- Lib/zipfile.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Lib/zipfile.py b/Lib/zipfile.py index a6c07e61c5..209dc4a0f3 100644 --- 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 - if n < 0: - buf = self._readbuffer[self._offset:n] - self._offset += len(buf) + end = n + self._offset + if end < len(self._readbuffer): + buf = self._readbuffer[self._offset:end] + 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 - if n < 0: - buf = self._readbuffer[self._offset:n] - self._offset += len(buf) + end = n + self._offset + if end < len(self._readbuffer): + buf = self._readbuffer[self._offset:end] + self._offset = end return buf + n = end - len(self._readbuffer) buf = self._readbuffer[self._offset:] self._readbuffer = b'' self._offset = 0 -- 2.40.0