diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-03-19 01:46:10 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-03-19 01:46:10 (GMT) |
| commit | b89a096d6dce43dad60618750ea9c62f770b2e7a (patch) | |
| tree | f36b1df16c60eabbf843909b411469a6090be99b | |
| parent | bde40078b07cd26f850f2a04848e9e1d95442a1f (diff) | |
| download | cpython-b89a096d6dce43dad60618750ea9c62f770b2e7a.zip cpython-b89a096d6dce43dad60618750ea9c62f770b2e7a.tar.gz cpython-b89a096d6dce43dad60618750ea9c62f770b2e7a.tar.bz2 | |
Use zlib's crc32 routine instead of binascii when available. zlib's is faster
when compiled properly optimized and about the same speed otherwise.
| -rw-r--r-- | Lib/zipfile.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 9f5669e..b601e74 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -6,8 +6,10 @@ import binascii, cStringIO try: import zlib # We may need its compression method + crc32 = zlib.crc32 except ImportError: zlib = None + crc32 = binascii.crc32 __all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile", "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile" ] @@ -940,7 +942,7 @@ class ZipFile: if not buf: break file_size = file_size + len(buf) - CRC = binascii.crc32(buf, CRC) + CRC = crc32(buf, CRC) if cmpr: buf = cmpr.compress(buf) compress_size = compress_size + len(buf) @@ -983,7 +985,7 @@ class ZipFile: zinfo.header_offset = self.fp.tell() # Start of header bytes self._writecheck(zinfo) self._didModify = True - zinfo.CRC = binascii.crc32(bytes) # CRC-32 checksum + zinfo.CRC = crc32(bytes) # CRC-32 checksum if zinfo.compress_type == ZIP_DEFLATED: co = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -15) @@ -1041,7 +1043,7 @@ class ZipFile: if extra: # Append a ZIP64 field to the extra's extra_data = struct.pack( - '<hh' + 'q'*len(extra), + '<HH' + 'Q'*len(extra), 1, 8*len(extra), *extra) + extra_data extract_version = max(45, zinfo.extract_version) |