Do not close external file objects passed to tarfile.open(mode='w:bz2')
when the TarFile is closed.
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 4991ae1..6199213 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -692,7 +692,6 @@
if self.mode == "w":
raw = self.bz2obj.flush()
self.fileobj.write(raw)
- self.fileobj.close()
# class _BZ2Proxy
#------------------------
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index f0e755e..f3bc12d 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -529,7 +529,19 @@
self.assertEqual(float(tarinfo.pax_headers["ctime"]), 1041808783.0)
-class WriteTest(unittest.TestCase):
+class WriteTestBase(unittest.TestCase):
+ # Put all write tests in here that are supposed to be tested
+ # in all possible mode combinations.
+
+ def test_fileobj_no_close(self):
+ fobj = StringIO.StringIO()
+ tar = tarfile.open(fileobj=fobj, mode=self.mode)
+ tar.addfile(tarfile.TarInfo("foo"))
+ tar.close()
+ self.assert_(fobj.closed is False, "external fileobjs must never closed")
+
+
+class WriteTest(WriteTestBase):
mode = "w:"
@@ -652,7 +664,7 @@
shutil.rmtree(tempdir)
-class StreamWriteTest(unittest.TestCase):
+class StreamWriteTest(WriteTestBase):
mode = "w|"
diff --git a/Misc/NEWS b/Misc/NEWS
index 4f1c3c7..1decc90 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -63,6 +63,9 @@
Library
-------
+- Do not close external file objects passed to tarfile.open(mode='w:bz2')
+ when the TarFile is closed.
+
- Issue #2959: For consistency with other file-like objects, gzip's
GzipFile.close() can now be called multiple times without raising
an exception.