Patch #1695229: Fix a regression with tarfile.open() and a missing name
argument.
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 261d9fb..474e306 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1044,7 +1044,9 @@
can be determined, `mode' is overridden by `fileobj's mode.
`fileobj' is not closed, when TarFile is closed.
"""
- self.name = os.path.abspath(name)
+ self.name = name
+ if self.name is not None:
+ self.name = os.path.abspath(name)
if len(mode) > 1 or mode not in "raw":
raise ValueError("mode must be 'r', 'a' or 'w'")
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index b1cbcf6..dc262f6 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -633,15 +633,21 @@
self.assertEqual(tarfile.filemode(07111), '---s--s--t')
class OpenFileobjTest(BaseTest):
- # Test for SF bug #1496501.
def test_opener(self):
+ # Test for SF bug #1496501.
fobj = StringIO.StringIO("foo\n")
try:
- tarfile.open("", "r", fileobj=fobj)
+ tarfile.open("", mode="r", fileobj=fobj)
except tarfile.ReadError:
self.assertEqual(fobj.tell(), 0, "fileobj's position has moved")
+ def test_fileobj(self):
+ # Test for SF bug #1695229, opening a tarfile without
+ # a name argument.
+ tarfile.open(mode="r", fileobj=open(tarname("")))
+ tarfile.TarFile(mode="r", fileobj=open(tarname("")))
+
if bz2:
# Bzip2 TestCases
class ReadTestBzip2(ReadTestGzip):