Issue #20875: Merge from 3.3

ned-deily · ned-deily · commit e5127299c866 · 2014-03-09T14:47:58.000-07:00
diff --git a/Lib/gzip.py b/Lib/gzip.py
@@ -96,7 +96,7 @@ def prepend(self, prepend=b'', readprevious=False):
             self._read -= len(prepend)
             return
         else:
-            self._buffer = self._buffer[read:] + prepend
+            self._buffer = self._buffer[self._read:] + prepend
         self._length = len(self._buffer)
         self._read = 0
 
diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
@@ -421,6 +421,13 @@ def test_read_with_extra(self):
         with gzip.GzipFile(fileobj=io.BytesIO(gzdata)) as f:
             self.assertEqual(f.read(), b'Test')
 
+    def test_prepend_error(self):
+        # See issue #20875
+        with gzip.open(self.filename, "wb") as f:
+            f.write(data1)
+        with gzip.open(self.filename, "rb") as f:
+            f.fileobj.prepend()
+
 class TestOpen(BaseTest):
     def test_binary_modes(self):
         uncompressed = data1 * 50
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -20,6 +20,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #20875: Prevent possible gzip "'read' is not defined" NameError.
+  Patch by Claudiu Popa.
+
 - Issue #11558: ``email.message.Message.attach`` now returns a more
   useful error message if ``attach`` is called on a message for which
   ``is_multipart`` is False.
