diff options
| -rw-r--r-- | Lib/tarfile.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_tarfile.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 658f2144bf..178514470e 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1141,9 +1141,13 @@ class TarFile(object): # Find out which *open() is appropriate for opening the file. for comptype in cls.OPEN_METH: func = getattr(cls, cls.OPEN_METH[comptype]) + if fileobj is not None: + saved_pos = fileobj.tell() try: return func(name, "r", fileobj) except (ReadError, CompressionError): + if fileobj is not None: + fileobj.seek(saved_pos) continue raise ReadError("file could not be opened successfully") diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index a76ceb1d2a..16745946fe 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -648,6 +648,16 @@ class HeaderErrorTest(unittest.TestCase): b = "a" + buf[1:] # manipulate the buffer, so checksum won't match. self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, b) +class OpenFileobjTest(BaseTest): + # Test for SF bug #1496501. + + def test_opener(self): + fobj = StringIO.StringIO("foo\n") + try: + tarfile.open("", "r", fileobj=fobj) + except tarfile.ReadError: + self.assertEqual(fobj.tell(), 0, "fileobj's position has moved") + if bz2: # Bzip2 TestCases class ReadTestBzip2(ReadTestGzip): @@ -693,6 +703,7 @@ def test_main(): tests = [ FileModeTest, HeaderErrorTest, + OpenFileobjTest, ReadTest, ReadStreamTest, ReadDetectTest, @@ -103,6 +103,8 @@ Core and builtins Library ------- +- Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. + - Patch #1182394 from Shane Holloway: speed up HMAC.hexdigest. - Patch #1262036: Prevent TarFiles from being added to themselves under |