mirror of
https://github.com/python/cpython
synced 2024-09-04 15:56:13 +00:00
- Revert a change that should have been blocked: py3k has no -3 flag!
- also remove a bogus debug print
This commit is contained in:
parent
2b9b4e1229
commit
2f9d4d1e16
|
@ -1157,14 +1157,6 @@ def __init__(self):
|
|||
if sys.platform != 'sunos5':
|
||||
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
|
||||
|
||||
def isvalid(self):
|
||||
|
|
|
@ -1067,25 +1067,14 @@ def close(self):
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue