summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-05-04 18:47:50 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-05-04 18:47:50 (GMT)
commit751125d46a8064cc0f3f9b5781814b44d6f6dc37 (patch)
tree5a3dc1e47194a59ad084c53cd0277014699d1fa6 /Lib
parentece0697f32066efa87945734fdad3dca1bd85201 (diff)
downloadcpython-751125d46a8064cc0f3f9b5781814b44d6f6dc37.zip
cpython-751125d46a8064cc0f3f9b5781814b44d6f6dc37.tar.gz
cpython-751125d46a8064cc0f3f9b5781814b44d6f6dc37.tar.bz2
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. ........ ................
Diffstat (limited to 'Lib')
-rw-r--r--Lib/gzip.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/gzip.py b/Lib/gzip.py
index 0fa4ddf..6a9fbc2 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -363,7 +363,7 @@ class GzipFile:
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.