summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-01-18 13:53:05 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-01-18 13:53:05 (GMT)
commit9fbec7ad5e8fcdd9dcc5abd496341b86d12a4472 (patch)
treedeb922b10d5de919bd8387cfcfa5dea37cd76aa9
parent53ad0cd2842b7327bde4ca04ee11c544e522ff43 (diff)
downloadcpython-9fbec7ad5e8fcdd9dcc5abd496341b86d12a4472.zip
cpython-9fbec7ad5e8fcdd9dcc5abd496341b86d12a4472.tar.gz
cpython-9fbec7ad5e8fcdd9dcc5abd496341b86d12a4472.tar.bz2
Issue #20238: TarFile opened with external fileobj and "w:gz" mode didn't
write complete output on close.
-rwxr-xr-xLib/tarfile.py2
-rw-r--r--Lib/test/test_tarfile.py6
-rw-r--r--Misc/NEWS3
3 files changed, 10 insertions, 1 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 987c011..8a69988 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1642,7 +1642,7 @@ class TarFile(object):
if not extfileobj and fileobj is not None:
fileobj.close()
raise
- t._extfileobj = extfileobj
+ t._extfileobj = False
return t
@classmethod
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 6986fc0..ceaa3aa 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -855,6 +855,12 @@ class WriteTestBase(TarTest):
tar.addfile(tarfile.TarInfo("foo"))
tar.close()
self.assertFalse(fobj.closed, "external fileobjs must never closed")
+ # Issue #20238: Incomplete gzip output with mode="w:gz"
+ data = fobj.getvalue()
+ del tar
+ support.gc_collect()
+ self.assertFalse(fobj.closed)
+ self.assertEqual(data, fobj.getvalue())
class WriteTest(WriteTestBase, unittest.TestCase):
diff --git a/Misc/NEWS b/Misc/NEWS
index 4e9be22..839e8fe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
Library
-------
+- Issue #20238: TarFile opened with external fileobj and "w:gz" mode didn't
+ write complete output on close.
+
- Issue #20245: The open functions in the tarfile module now correctly handle
empty mode.