Skip to content

Allow filename mismatch in local and central directories in zipfile.py #3035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zyxtarmo wants to merge 2 commits into from
Closed

Allow filename mismatch in local and central directories in zipfile.py #3035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6f7697
Allow filename mismatch in local and central directories in zipfile.py
zyxtarmo Aug 9, 2017
42ea474
Merge pull request #1 from zyxtarmo/zyxtarmo-zipfile-1
zyxtarmo Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ class ZipFile:
fp = None # Set here since __del__ checks it
_windows_illegal_name_trans_table = None

def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True):
def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True, ignoreFilenameMismatch=False):
"""Open the ZIP file with mode read 'r', write 'w', exclusive create 'x',
or append 'a'."""
if mode not in ('r', 'w', 'x', 'a'):
Expand All @@ -1066,6 +1066,7 @@ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True):

self._allowZip64 = allowZip64
self._didModify = False
self._ignoreFilenameMismatch = ignoreFilenameMismatch
self.debug = 0 # Level of printing: 0 through 3
self.NameToInfo = {} # Find file info given name
self.filelist = [] # List of ZipInfo instances for archive
Expand Down Expand Up @@ -1389,7 +1390,7 @@ def open(self, name, mode="r", pwd=None, *, force_zip64=False):
else:
fname_str = fname.decode("cp437")

if fname_str != zinfo.orig_filename:
if fname_str != zinfo.orig_filename and not self._ignoreFilenameMismatch:
raise BadZipFile(
'File name in directory %r and header %r differ.'
% (zinfo.orig_filename, fname))
Expand Down