[Python-3000-checkins] r62725 - in python/branches/py3k: Lib/test/test_zipfile.py Lib/zipfile.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon May  5 19:44:38 2008
New Revision: 62725

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

........
  r62724 | martin.v.loewis | 2008-05-05 19:16:58 +0200 (Mo, 05 Mai 2008) | 2 lines
  
  Issue #1734346: Support Unicode file names for zipfiles.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_zipfile.py
   python/branches/py3k/Lib/zipfile.py

Modified: python/branches/py3k/Lib/test/test_zipfile.py
==============================================================================
--- python/branches/py3k/Lib/test/test_zipfile.py	(original)
+++ python/branches/py3k/Lib/test/test_zipfile.py	Mon May  5 19:44:38 2008
@@ -541,6 +541,14 @@
 
 
 class OtherTests(unittest.TestCase):
+    def testUnicodeFilenames(self):
+        zf = zipfile.ZipFile(TESTFN, "w")
+        zf.writestr("foo.txt", "Test for unicode filename")
+        zf.writestr("fo\xf6.txt", "Test for unicode filename")
+        zf.close()
+        zf = zipfile.ZipFile(TESTFN, "w")
+
+
     def testCreateNonExistentFileForAppend(self):
         if os.path.exists(TESTFN):
             os.unlink(TESTFN)

Modified: python/branches/py3k/Lib/zipfile.py
==============================================================================
--- python/branches/py3k/Lib/zipfile.py	(original)
+++ python/branches/py3k/Lib/zipfile.py	Mon May  5 19:44:38 2008
@@ -257,12 +257,19 @@
             self.extract_version = max(45, self.extract_version)
             self.create_version = max(45, self.extract_version)
 
+        filename, flag_bits = self._encodeFilenameFlags()
         header = struct.pack(structFileHeader, stringFileHeader,
-                 self.extract_version, self.reserved, self.flag_bits,
+                 self.extract_version, self.reserved, flag_bits,
                  self.compress_type, dostime, dosdate, CRC,
                  compress_size, file_size,
-                 len(self.filename), len(extra))
-        return header + self.filename.encode("utf-8") + extra
+                 len(filename), len(extra))
+        return header + filename + extra
+
+    def _encodeFilenameFlags(self):
+        try:
+            return self.filename.encode('ascii'), self.flag_bits
+        except UnicodeEncodeError:
+            return self.filename.encode('utf-8'), self.flag_bits | 0x800
 
     def _decodeExtra(self):
         # Try to decode the extra field.
@@ -681,8 +688,15 @@
             if self.debug > 2:
                 print(centdir)
             filename = fp.read(centdir[_CD_FILENAME_LENGTH])
+            flags = centdir[5]
+            if flags & 0x800:
+                # UTF-8 file names extension
+                filename = filename.decode('utf-8')
+            else:
+                # Historical ZIP filename encoding
+                filename = filename.decode('cp437')
             # Create ZipInfo instance to store file information
-            x = ZipInfo(filename.decode("utf-8"))
+            x = ZipInfo(filename)
             x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH])
             x.comment = fp.read(centdir[_CD_COMMENT_LENGTH])
             total = (total + centdir[_CD_FILENAME_LENGTH]
@@ -1067,16 +1081,17 @@
                     extract_version = zinfo.extract_version
                     create_version = zinfo.create_version
 
+                filename, flag_bits = zinfo._encodeFilenameFlags()
                 centdir = struct.pack(structCentralDir,
                  stringCentralDir, create_version,
                  zinfo.create_system, extract_version, zinfo.reserved,
-                 zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+                 flag_bits, zinfo.compress_type, dostime, dosdate,
                  zinfo.CRC, compress_size, file_size,
-                 len(zinfo.filename), len(extra_data), len(zinfo.comment),
+                 len(filename), len(extra_data), len(zinfo.comment),
                  0, zinfo.internal_attr, zinfo.external_attr,
                  header_offset)
                 self.fp.write(centdir)
-                self.fp.write(zinfo.filename.encode("utf-8"))
+                self.fp.write(filename)
                 self.fp.write(extra_data)
                 self.fp.write(zinfo.comment)