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

#10801: In zipfile, support different encodings for the header and the filenames. Patch by MvL, test by Eli Bendersky.

Browse source
This commit is contained in:
Georg Brandl 2011-01-01 10:09:32 +00:00
parent d30a0dd681
commit 5ba11de845
4 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/zipfile.py
View file

@ -930,7 +930,13 @@ class ZipFile:
if fheader[_FH_EXTRA_FIELD_LENGTH]:
zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
if fname != zinfo.orig_filename.encode("utf-8"):
if zinfo.flag_bits & 0x800:
# UTF-8 filename
fname_str = fname.decode("utf-8")
else:
fname_str = fname.decode("cp437")
if fname_str != zinfo.orig_filename:
if not self._filePassed:
zef_file.close()
raise BadZipFile(