mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

- Revert a change that should have been blocked: py3k has no -3 flag!

Browse source 
- also remove a bogus debug print
This commit is contained in:
Amaury Forgeot d'Arc 2008-03-20 00:35:03 +00:00
parent 2b9b4e1229
commit 2f9d4d1e16
2 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/regrtest.py
View file

@ -1157,14 +1157,6 @@ class _ExpectedSkips:
if sys.platform != 'sunos5': if sys.platform != 'sunos5':
self.expected.add('test_nis') self.expected.add('test_nis')
# TODO: This is a hack to raise TestSkipped if -3 is not enabled.
# Instead of relying on callable to have a warning, we should expose
# the -3 flag to Python code somehow
with test_support.catch_warning() as w:
callable(int)
if w.message is None:
self.expected.add('test_py3kwarn')
self.valid = True self.valid = True
def isvalid(self): def isvalid(self):

27
Lib/zipfile.py
View file

@ -1067,25 +1067,14 @@ class ZipFile:
extract_version = zinfo.extract_version extract_version = zinfo.extract_version
create_version = zinfo.create_version create_version = zinfo.create_version
try: centdir = struct.pack(structCentralDir,
centdir = struct.pack(structCentralDir, stringCentralDir, create_version,
stringCentralDir, create_version, zinfo.create_system, extract_version, zinfo.reserved,
zinfo.create_system, extract_version, zinfo.reserved, zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
zinfo.flag_bits, zinfo.compress_type, dostime, dosdate, zinfo.CRC, compress_size, file_size,
zinfo.CRC, compress_size, file_size, len(zinfo.filename), len(extra_data), len(zinfo.comment),
len(zinfo.filename), len(extra_data), len(zinfo.comment), 0, zinfo.internal_attr, zinfo.external_attr,
0, zinfo.internal_attr, zinfo.external_attr, header_offset)
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
self.fp.write(centdir) self.fp.write(centdir)
self.fp.write(zinfo.filename.encode("utf-8")) self.fp.write(zinfo.filename.encode("utf-8"))
self.fp.write(extra_data) self.fp.write(extra_data)