Skip to content
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

When iterating over Zipfiles, always use the Unix file separator to fix a Windows issue #638

Merged
merged 10 commits into from
Apr 20, 2019
Merged

When iterating over Zipfiles, always use the Unix file separator to fix a Windows issue #638

Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b52fb4
Change windows separator with unix separator in regex
yorinasub17 Dec 21, 2018
8567355
Fix indentation
yorinasub17 Dec 21, 2018
f17e3a1
Simplify to force / instead of using os.sep
yorinasub17 Apr 9, 2019
081fd1c
Update link to zip spec and style update for pattern
yorinasub17 Apr 10, 2019
08db4b3
Fix style error
yorinasub17 Apr 10, 2019
539e671
Fix prefix to use / instead os.sep as well
yorinasub17 Apr 10, 2019
3241d07
ensure relpath uses /
yorinasub17 Apr 10, 2019
07e88b3
Clean up some more by using replace
yorinasub17 Apr 10, 2019
83ae158
Make comments better
yorinasub17 Apr 10, 2019
2546df0
Clean up code based on PR comments
yorinasub17 Apr 20, 2019
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
8 changes: 4 additions & 4 deletions pex/third_party/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ def iter_root_packages(self, relpath):
yield package

def _filter_names(self, relpath, pattern, group):
pat = re.compile(r'^{prefix}{pattern}$'
.format(prefix=self.prefix + ((relpath + os.sep) if relpath else ''),
pattern=pattern))

# We use '/' here instead of os.sep because the zip file format spec specifies that paths must use forward slashes.
# See section 4.4.17 of https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
Eric-Arellano marked this conversation as resolved.
Show resolved Hide resolved
relpath_pat = '{}/'.format(relpath) if relpath else ''
pat = re.compile(r'^{}{}{}$'.format(self.prefix, relpath_pat, pattern))
with contextlib.closing(zipfile.ZipFile(self.zipfile_path)) as zf:
for name in zf.namelist():
match = pat.match(name)
Expand Down