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

Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support

Browse source 
different encodings for the header and the filenames.  Patch by MvL, test by
Eli Bendersky.
This commit is contained in:
Victor Stinner 2011-05-18 13:43:23 +02:00
parent 02a67ac72b
commit ff1d2f4cc5
3 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/zipfile.py
View file

@ -928,7 +928,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:
raise BadZipfile(
'File name in directory %r and header %r differ.'
% (zinfo.orig_filename, fname))