9a69fa65 by 周伟奇

fix decode bug

1 parent 5aef6b62
......@@ -1210,11 +1210,11 @@ class ZipFile:
filename = filename.decode('utf-8')
else:
# Historical ZIP filename encoding
filename = filename.decode('cp437')
# filename = filename.decode('cp437')
try:
filename = filename.encode("cp437").decode('gbk')
filename = filename.decode('utf-8')
except:
pass
filename = filename.decode("gbk")
# Create ZipInfo instance to store file information
x = ZipInfo(filename)
x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH])
......@@ -1392,11 +1392,11 @@ class ZipFile:
# UTF-8 filename
fname_str = fname.decode("utf-8")
else:
fname_str = fname.decode("cp437")
# fname_str = fname.decode("cp437")
try:
fname_str = fname_str.encode("cp437").decode('gbk')
fname_str = fname.decode("utf-8")
except:
pass
fname_str = fname.decode("gbk")
if fname_str != zinfo.orig_filename:
raise BadZipFile(
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!