changeset:   89535:42599de6a4de
parent:      89533:8f7486263212
parent:      89534:c3836de644e0
user:        Ned Deily <nad@acm.org>
date:        Sun Mar 09 14:47:58 2014 -0700
files:       Lib/gzip.py Lib/test/test_gzip.py Misc/NEWS
description:
Issue #20875: Merge from 3.3


diff -r 8f7486263212 -r 42599de6a4de Lib/gzip.py
--- a/Lib/gzip.py	Sun Mar 09 15:29:24 2014 -0400
+++ b/Lib/gzip.py	Sun Mar 09 14:47:58 2014 -0700
@@ -96,7 +96,7 @@
             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 -r 8f7486263212 -r 42599de6a4de Lib/test/test_gzip.py
--- a/Lib/test/test_gzip.py	Sun Mar 09 15:29:24 2014 -0400
+++ b/Lib/test/test_gzip.py	Sun Mar 09 14:47:58 2014 -0700
@@ -421,6 +421,13 @@
         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 -r 8f7486263212 -r 42599de6a4de Misc/NEWS
--- a/Misc/NEWS	Sun Mar 09 15:29:24 2014 -0400
+++ b/Misc/NEWS	Sun Mar 09 14:47:58 2014 -0700
@@ -20,6 +20,9 @@
 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.