Merged revisions 80762 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80762 | mark.dickinson | 2010-05-04 19:45:27 +0100 (Tue, 04 May 2010) | 3 lines

  Fix test_gzip failure on OS X.  The failure was a result of trying to fflush
  a file that wasn't open for writing.  Patch by Antoine Pitrou.
........

diff --git a/Lib/gzip.py b/Lib/gzip.py
index ef6befcb7d3f2eee1309941018796733eacf978e..fab55a3015d0d793c28d5e016e0f9edf7dd865c0 100644 (file)
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -380,7 +380,7 @@ class GzipFile(io.BufferedIOBase):
         if self.mode == WRITE:
             # Ensure the compressor's buffer is flushed
             self.fileobj.write(self.compress.flush(zlib_mode))
-        self.fileobj.flush()
+            self.fileobj.flush()
 
     def fileno(self):
         """Invoke the underlying file object's fileno() method.