mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-39356, zipfile: Remove code handling DeprecationWarning (GH-18027)

Browse source 
Remove old "except DeprecationWarning:" code path added by
commit bf02e3bb21. It's no longer
needed.

struct.pack() no longer emit DeprecationWarning if getting a float
whereas an integer is expected. It now raises an hard error instead.
This commit is contained in:
Victor Stinner 2020-01-17 15:17:48 +01:00 • committed by GitHub
parent 10fd6b2b9f
commit 1d3b0aaa54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/zipfile.py
View file

@ -1867,25 +1867,15 @@ class ZipFile:
extract_version = max(min_version, zinfo.extract_version) extract_version = max(min_version, zinfo.extract_version)
create_version = max(min_version, zinfo.create_version) create_version = max(min_version, zinfo.create_version)
try: filename, flag_bits = zinfo._encodeFilenameFlags()
filename, flag_bits = zinfo._encodeFilenameFlags() 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, flag_bits, zinfo.compress_type, dostime, dosdate,
flag_bits, zinfo.compress_type, dostime, dosdate, zinfo.CRC, compress_size, file_size,
zinfo.CRC, compress_size, file_size, len(filename), len(extra_data), len(zinfo.comment),
len(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((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(centdir)
self.fp.write(filename) self.fp.write(filename)
self.fp.write(extra_data) self.fp.write(extra_data)