summaryrefslogtreecommitdiff
path: root/pkg_resources
diff options
context:
space:
mode:
authorTim Hatch <thatch@fb.com>2020-12-14 09:14:45 -0800
committerTim Hatch <thatch@fb.com>2020-12-21 12:50:42 -0800
commitc3019cf01e7f3d61f8fa41143e40546247292045 (patch)
treeb652a3fa38fdf8243449a6063e546e29201baffa /pkg_resources
parent44d45ae20a663f1cb75812657cee1244e3dddb58 (diff)
downloadpython-setuptools-git-c3019cf01e7f3d61f8fa41143e40546247292045.tar.gz
Find .egg-info in zipimport too
Fixes #2489
Diffstat (limited to 'pkg_resources')
-rw-r--r--pkg_resources/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 737f4d5f..ba90c8c4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1978,12 +1978,13 @@ def find_eggs_in_zip(importer, path_item, only=False):
# don't yield nested distros
return
for subitem in metadata.resource_listdir(''):
+ lower = subitem.lower()
if _is_egg_path(subitem):
subpath = os.path.join(path_item, subitem)
dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
for dist in dists:
yield dist
- elif subitem.lower().endswith('.dist-info'):
+ elif any(map(lower.endswith, ('.dist-info', '.egg-info'))):
subpath = os.path.join(path_item, subitem)
submeta = EggMetadata(zipimport.zipimporter(subpath))
submeta.egg_info = subpath