Fix typos

diracdeltas · diracdeltas · commit 0a86dea68041 · 2013-09-20T18:15:32.000-07:00
diff --git a/utils/create_xpi.py b/utils/create_xpi.py
@@ -6,55 +6,22 @@
 # ZipFile: infolist, write, writestr,
 
 import os
-import zipfile2_6 as zipfile
+import zipfile_deterministic as zipfile
 import sys
 import time
 import glob
 
 xpiName = sys.argv[1]
 exclusionsFile = sys.argv[2]
 exclusions = []
-tmpfile = '../pkg/tmp.xpi'
 compress = zipfile.ZIP_DEFLATED
 
 with open(exclusionsFile) as f:
     for line in f:
         exclusions.extend(glob.glob(line.strip()))
+exclusions = map(lambda x: './'+x, exclusions)
 
 xpiFile = zipfile.ZipFile(xpiName, mode='w', compression=compress)
 
-def createTmpZipInfo():
-    """
-    Create a non-deterministic zip in order to use the file info
-    generated to create a deterministic zip
-    """
-    xpiFileTmp = zipfile.ZipFile(tmpfile, mode='w', compression=compress)
-    for root,subfolders,files in os.walk('.'):
-        for fi in files:
-            filename = os.path.join(root,fi)
-            if filename not in map(lambda x: './'+x, exclusions):
-                xpiFileTmp.write(filename, compress_type=compress)
-    xpiFileTmp.close()
-    xpiFileTmp.infolist().sort(key = lambda x: x.filename)
-    return xpiFileTmp.infolist()
-
-def constructZipDet():
-    """
-    Create a deterministic zip by setting timestamps,
-    operating system, and pkzip version info to hard-coded
-    values. See the pkzip specification at
-    https://www.pkware.com/documents/casestudies/APPNOTE.TXT
-    """
-    tmpInfo = createTmpZipInfo()
-    for info in tmpInfo:
-        info.date_time = time.gmtime(1378343307)
-        info.create_system = 3 # aka, UNIX
-        info.create_version = 20
-        info.extract_version = 20
-        info.external_attr = 0600 << 16
-        info.file_size = long(info.file_size)  # is int on some OS's
-        xpiFile.writestr(info, open(info.filename).read())
-
-constructZipDet()
+xpiFile.write_from_directory('.', exclusions, compress_type=compress)
 xpiFile.close()
-os.remove(tmpfile)
diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py
@@ -7,6 +7,7 @@
 
 import struct, os, time, sys, shutil
 import binascii, cStringIO, stat
+import unicodedata
 
 try:
     import zlib # We may need its compression method
@@ -1133,7 +1134,7 @@ def writestr(self, zinfo_or_arcname, bytes):
         self.NameToInfo[zinfo.filename] = zinfo
 
     def write_from_directory(self, directory, exclusions=None,
-                             compress_type=None, date_time=DEFAULT_DATE)
+                             compress_type=None, date_time=DEFAULT_DATE):
         """
         Create a ZIP package deterministically from a directory.
         We need to sort the files in an OS-independent way before adding to the archive.
