summaryrefslogtreecommitdiffstats
path: root/Lib/zipfile.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-09-25 21:38:29 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-09-25 21:38:29 (GMT)
commit6e52a5a8376579cc195ba411f2f3e556286fb0f2 (patch)
tree5a78cd049207dfe76916798dad3b83c78462fa78 /Lib/zipfile.py
parent0e33da095f39ad18791cb4457dca868a74d84e72 (diff)
downloadcpython-6e52a5a8376579cc195ba411f2f3e556286fb0f2.zip
cpython-6e52a5a8376579cc195ba411f2f3e556286fb0f2.tar.gz
cpython-6e52a5a8376579cc195ba411f2f3e556286fb0f2.tar.bz2
Merged revisions 75064 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75064 | ezio.melotti | 2009-09-26 00:35:24 +0300 (Sat, 26 Sep 2009) | 1 line fix print statement ........
Diffstat (limited to 'Lib/zipfile.py')
-rw-r--r--Lib/zipfile.py29
1 files changed, 14 insertions, 15 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 8c4ffc5..6357b94 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1188,22 +1188,21 @@ class ZipFile:
try:
filename, flag_bits = zinfo._encodeFilenameFlags()
centdir = struct.pack(structCentralDir,
- stringCentralDir, create_version,
- zinfo.create_system, extract_version, zinfo.reserved,
- flag_bits, zinfo.compress_type, dostime, dosdate,
- zinfo.CRC, compress_size, file_size,
- len(filename), len(extra_data), len(zinfo.comment),
- 0, zinfo.internal_attr, zinfo.external_attr,
- header_offset)
+ stringCentralDir, create_version,
+ zinfo.create_system, extract_version, zinfo.reserved,
+ flag_bits, zinfo.compress_type, dostime, dosdate,
+ zinfo.CRC, compress_size, file_size,
+ len(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)
+ print((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), file=sys.stderr)
raise
self.fp.write(centdir)
self.fp.write(filename)