Merged revisions 80618 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80618 | lars.gustaebel | 2010-04-29 17:37:02 +0200 (Thu, 29 Apr 2010) | 10 lines

  Merged revisions 80616 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80616 | lars.gustaebel | 2010-04-29 17:23:38 +0200 (Thu, 29 Apr 2010) | 4 lines

    Issue #8464: tarfile.open(name, mode="w|") no longer creates
    files with execute permissions set.
  ........
................

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index ef316b53eebb6734574cbda4b3e7ed7c41261fcc..125d95dd8a8a89f1bdf90220daee930679ecf68c 100644 (file)
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -349,7 +349,7 @@ class _LowLevelFile:
         }[mode]
         if hasattr(os, "O_BINARY"):
             mode |= os.O_BINARY
-        self.fd = os.open(name, mode)
+        self.fd = os.open(name, mode, 0o666)
 
     def close(self):
         os.close(self.fd)

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 2746448d816bd193d1e8bd4d45a119eeaee143f3..1a556eb0f59ced1982bc52e1a3cfafecea27f324 100644 (file)
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -702,6 +702,24 @@ class StreamWriteTest(WriteTestBase):
         self.assertTrue(data.count(b"\0") == tarfile.RECORDSIZE,
                          "incorrect zero padding")
 
+    def test_file_mode(self):
+        # Test for issue #8464: Create files with correct
+        # permissions.
+        if sys.platform == "win32" or not hasattr(os, "umask"):
+            return
+
+        if os.path.exists(tmpname):
+            os.remove(tmpname)
+
+        original_umask = os.umask(0o022)
+        try:
+            tar = tarfile.open(tmpname, self.mode)
+            tar.close()
+            mode = os.stat(tmpname).st_mode & 0o777
+            self.assertEqual(mode, 0o644, "wrong file permissions")
+        finally:
+            os.umask(original_umask)
+
 
 class GNUWriteTest(unittest.TestCase):
     # This testcase checks for correct creation of GNU Longname

diff --git a/Misc/NEWS b/Misc/NEWS
index 0e45fef3bc17b57c1e0ed06efdd73a8f2c65f312..bfc6772c23959d7cf0c551adabc050a5761f4c9b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #8464: tarfile no longer creates files with execute permissions set
+  when mode="w|" is used.
+
 - Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
   of the Linux kernel.  Patch by Yaniv Aknin.