Perform os.path.abspath to result of os.fspath, use context manager

0x29a · 0x29a · commit 82882ddb7006 · 2019-06-06T18:19:45.000+03:00
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
@@ -1468,7 +1468,9 @@ def __init__(self, name=None, mode="r", fileobj=None, format=None,
             if hasattr(fileobj, "mode"):
                 self._mode = fileobj.mode
             self._extfileobj = True
-        self.name = os.fspath(name) if name else None
+
+        name = os.fspath(name) if name else None
+        self.name = os.path.abspath(name) if name else None
         self.fileobj = fileobj
 
         # Init attributes.
@@ -1938,12 +1940,13 @@ def add(self, name, arcname=None, recursive=True, *, filter=None):
            excluded from the archive.
         """
         self._check("awx")
+        name = os.fspath(name)
 
         if arcname is None:
             arcname = name
 
         # Skip if somebody tries to archive the archive...
-        if self.name is not None and os.fspath(name) == self.name:
+        if self.name is not None and os.path.abspath(name) == self.name:
             self._dbg(2, "tarfile: Skipped %r" % name)
             return
 
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
@@ -1422,9 +1422,10 @@ def test_file_mode(self):
             os.umask(original_umask)
 
     def test_open_by_path_object(self):
-        # Test for issue #37144: broken open for stream write by path-like object
-        tar = tarfile.open(pathlib.Path(tmpname), self.mode)
-        tar.close()
+        # Test for issue #37144:
+        # broken open for stream write by path-like object
+        with tarfile.open(pathlib.Path(tmpname), self.mode):
+            pass
 
 class GzipStreamWriteTest(GzipTest, StreamWriteTest):
     pass
