diff options
| -rw-r--r-- | Lib/gzip.py | 13 | ||||
| -rw-r--r-- | Lib/test/test_gzip.py | 22 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 38 insertions, 0 deletions
diff --git a/Lib/gzip.py b/Lib/gzip.py index 6a9fbc2c1ad..8a2a7184df0 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -129,6 +129,7 @@ class GzipFile: self.fileobj = fileobj self.offset = 0 self.mtime = mtime + self.closed = False if self.mode == WRITE: self._write_gzip_header() @@ -145,6 +146,13 @@ class GzipFile: s = repr(self.fileobj) return '<gzip ' + s[1:-1] + ' ' + hex(id(self)) + '>' + def _check_closed(self): + """Raises a ValueError if the underlying file object has been closed. + + """ + if self.closed: + raise ValueError('I/O operation on closed file.') + def _init_write(self, filename): self.name = filename self.crc = zlib.crc32(b"") & 0xffffffff @@ -215,6 +223,7 @@ class GzipFile: def write(self,data): + self._check_closed() if self.mode != WRITE: import errno raise IOError(errno.EBADF, "write() on read-only GzipFile object") @@ -228,6 +237,7 @@ class GzipFile: self.offset += len(data) def read(self, size=-1): + self._check_closed() if self.mode != READ: import errno raise IOError(errno.EBADF, "read() on write-only GzipFile object") @@ -349,6 +359,7 @@ class GzipFile: if self.myfileobj: self.myfileobj.close() self.myfileobj = None + self.closed = True def __del__(self): try: @@ -360,6 +371,7 @@ class GzipFile: self.close() def flush(self,zlib_mode=zlib.Z_SYNC_FLUSH): + self._check_closed() if self.mode == WRITE: # Ensure the compressor's buffer is flushed self.fileobj.write(self.compress.flush(zlib_mode)) @@ -377,6 +389,7 @@ class GzipFile: return False def tell(self): + self._check_closed() return self.offset def rewind(self): diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py index d92863532fa..a4a7e244802 100644 --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -51,6 +51,28 @@ class TestGzip(unittest.TestCase): f = gzip.GzipFile(self.filename, 'r') ; d = f.read() ; f.close() self.assertEqual(d, data1*50) + def test_io_on_closed_object(self): + # Test that I/O operations on closed GzipFile objects raise a + # ValueError, just like the corresponding functions on file objects. + + # Write to a file, open it for reading, then close it. + self.test_write() + f = gzip.GzipFile(self.filename, 'r') + f.close() + with self.assertRaises(ValueError): + f.read(1) + with self.assertRaises(ValueError): + f.seek(0) + with self.assertRaises(ValueError): + f.tell() + # Open the file for writing, then close it. + f = gzip.GzipFile(self.filename, 'w') + f.close() + with self.assertRaises(ValueError): + f.write(b'') + with self.assertRaises(ValueError): + f.flush() + def test_append(self): self.test_write() # Append to the previous file diff --git a/Misc/NEWS b/Misc/NEWS index 134232c62fd..ec6d9f9bdff 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,9 @@ C-API Library ------- +- Issue #9759: GzipFile now raises ValueError when an operation is attempted + after the file is closed. Patch by Jeffrey Finkelstein. + - Issue #9042: Fix interaction of custom translation classes and caching in gettext. |