diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-03-20 00:35:03 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-03-20 00:35:03 (GMT) |
| commit | 2f9d4d1e1684dbaf352bea9eb62dbf7df2a42227 (patch) | |
| tree | 337c6bb305612300f3e59564ca739858a230ab63 /Lib/zipfile.py | |
| parent | 2b9b4e12291389440dd705420f717263a88c79d1 (diff) | |
| download | cpython-2f9d4d1e1684dbaf352bea9eb62dbf7df2a42227.zip cpython-2f9d4d1e1684dbaf352bea9eb62dbf7df2a42227.tar.gz cpython-2f9d4d1e1684dbaf352bea9eb62dbf7df2a42227.tar.bz2 | |
- Revert a change that should have been blocked: py3k has no -3 flag!
- also remove a bogus debug print
Diffstat (limited to 'Lib/zipfile.py')
| -rw-r--r-- | Lib/zipfile.py | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 719ed44..2672d0a 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1067,25 +1067,14 @@ class ZipFile: extract_version = zinfo.extract_version create_version = zinfo.create_version - try: - centdir = struct.pack(structCentralDir, - stringCentralDir, create_version, - zinfo.create_system, extract_version, zinfo.reserved, - zinfo.flag_bits, zinfo.compress_type, dostime, dosdate, - zinfo.CRC, compress_size, file_size, - len(zinfo.filename), len(extra_data), len(zinfo.comment), - 0, zinfo.internal_attr, zinfo.external_attr, - header_offset) - except DeprecationWarning: - print >>sys.stderr, (structCentralDir, - stringCentralDir, create_version, - zinfo.create_system, extract_version, zinfo.reserved, - zinfo.flag_bits, zinfo.compress_type, dostime, dosdate, - zinfo.CRC, compress_size, file_size, - len(zinfo.filename), len(extra_data), len(zinfo.comment), - 0, zinfo.internal_attr, zinfo.external_attr, - header_offset) - raise + centdir = struct.pack(structCentralDir, + stringCentralDir, create_version, + zinfo.create_system, extract_version, zinfo.reserved, + zinfo.flag_bits, zinfo.compress_type, dostime, dosdate, + zinfo.CRC, compress_size, file_size, + len(zinfo.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(extra_data) |