From: Lars Gustäbel <lars@gustaebel.de>
Date: Wed, 21 Dec 2011 18:27:50 +0000 (+0100)
Subject: Issue #13639: Accept unicode filenames in tarfile.open(mode="w|gz").
X-Git-Tag: v2.7.3rc1~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d4d074c9996f07a859a6e5a38774aa65a4ff85c;p=python

Issue #13639: Accept unicode filenames in tarfile.open(mode="w|gz").

Passing a unicode filename to tarfile.open() along with mode "w|gz" failed
with a UnicodeError because the filename was not encoded properly before being
written to the gzipped stream in the FNAME extra field.
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index ed5bcf20ee..bd73965abf 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -454,6 +454,8 @@ class _Stream:
                                             0)
         timestamp = struct.pack("<L", long(time.time()))
         self.__write("\037\213\010\010%s\002\377" % timestamp)
+        if type(self.name) is unicode:
+            self.name = self.name.encode("iso-8859-1", "replace")
         if self.name.endswith(".gz"):
             self.name = self.name[:-3]
         self.__write(self.name + NUL)
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 49d2d07d90..d5b864e238 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -994,6 +994,13 @@ class StreamWriteTest(WriteTestBase):
         finally:
             os.umask(original_umask)
 
+    def test_issue13639(self):
+        try:
+            with tarfile.open(unicode(tmpname, sys.getfilesystemencoding()), self.mode):
+                pass
+        except UnicodeDecodeError:
+            self.fail("_Stream failed to write unicode filename")
+
 
 class GNUWriteTest(unittest.TestCase):
     # This testcase checks for correct creation of GNU Longname
diff --git a/Misc/NEWS b/Misc/NEWS
index d2082a6568..7b6dbd26ed 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -86,6 +86,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #13639: Accept unicode filenames in tarfile.open(mode="w|gz").
+
 - Issue #1785: Fix inspect and pydoc with misbehaving descriptors.
 
 - Issue #7502: Fix equality comparison for DocTestCase instances.  Patch by