[Python-checkins] r80765 - in python/branches/release31-maint: Lib/gzip.py

[mark.dickinson]

Author: mark.dickinson
Date: Tue May  4 20:47:50 2010
New Revision: 80765

Log:
Merged revisions 80764 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80764 | mark.dickinson | 2010-05-04 19:47:04 +0100 (Tue, 04 May 2010) | 10 lines
  
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/gzip.py

Modified: python/branches/release31-maint/Lib/gzip.py
==============================================================================
--- python/branches/release31-maint/Lib/gzip.py	(original)
+++ python/branches/release31-maint/Lib/gzip.py	Tue May  4 20:47:50 2010
@@ -363,7 +363,7 @@
         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.