diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-12-24 19:18:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 19:18:59 -0600 |
| commit | 1ad2c11ca1d8535c61215b184d18bf713ef813c9 (patch) | |
| tree | d59aa23daa67db73200b82c7c39e1a117fd719c7 /pkg_resources/__init__.py | |
| parent | e001996ab483c7c725e8894f560fb84c43150bcc (diff) | |
| parent | 0d0baed8da468b2cedb9aa6caf60dc15fdeebd34 (diff) | |
| download | python-setuptools-git-38.2.5.tar.gz | |
Merge pull request #1232 from duggelz/dgreiman/issue118838.2.5
Fix trailing slash handling in pkg_resources.ZipProvider
Diffstat (limited to 'pkg_resources/__init__.py')
| -rw-r--r-- | pkg_resources/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 73334641..08f9bbe7 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -1693,6 +1693,9 @@ class ZipProvider(EggProvider): def _zipinfo_name(self, fspath): # Convert a virtual filename (full path to file) into a zipfile subpath # usable with the zipimport directory cache for our target archive + fspath = fspath.rstrip(os.sep) + if fspath == self.loader.archive: + return '' if fspath.startswith(self.zip_pre): return fspath[len(self.zip_pre):] raise AssertionError( |