summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-05-04 18:47:04 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-05-04 18:47:04 (GMT)
commita9eb87a144988731b25923da1d531a572037f160 (patch)
tree0a4024a5de8e7a0d53d0dc2d71450bddeb9830a9
parent7eab65d74f78eefeebca617a9fceb1ad56125936 (diff)
downloadcpython-a9eb87a144988731b25923da1d531a572037f160.zip
cpython-a9eb87a144988731b25923da1d531a572037f160.tar.gz
cpython-a9eb87a144988731b25923da1d531a572037f160.tar.bz2
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. ........
-rw-r--r--Lib/gzip.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/gzip.py b/Lib/gzip.py
index ef6befc..fab55a3 100644
--- 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.