Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Lib/gzip.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,17 @@ def __init__(self, filename=None, mode=None,

self.fileobj = fileobj

if self.mode == WRITE:
self._write_gzip_header(compresslevel)
try:
if self.mode == WRITE:
self._write_gzip_header(compresslevel)
except BaseException:
# Avoid a ResourceWarning if the write fails, eg read-only file or KeyboardInterrupt
try:
if self.myfileobj is not None:
self.myfileobj.close()
finally:
self.fileobj = None
raise

@property
def mtime(self):
Expand Down
12 changes: 8 additions & 4 deletions Lib/test/test_tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from test import support
from test.support import os_helper
from test.support import script_helper
from test.support import warnings_helper

# Check for our compression modules.
try:
Expand Down Expand Up @@ -1638,10 +1639,13 @@ def write(self, data):
raise exctype

f = BadFile()
with self.assertRaises(exctype):
tar = tarfile.open(tmpname, self.mode, fileobj=f,
format=tarfile.PAX_FORMAT,
pax_headers={'non': 'empty'})
with (
warnings_helper.check_no_resource_warning(),
self.assertRaises(exctype),
):
tarfile.open(tmpname, self.mode, fileobj=f,
format=tarfile.PAX_FORMAT,
pax_headers={'non': 'empty'})
self.assertFalse(f.closed)

def test_missing_fileobj(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix :exc:`ResourceWarning` when constructing a :class:`gzip.GzipFile` in write mode with a broken file object.
Loading