diff options
| author | Marcus Smith <qwcode@gmail.com> | 2014-01-04 18:58:03 -0800 |
|---|---|---|
| committer | Marcus Smith <qwcode@gmail.com> | 2014-01-04 18:58:03 -0800 |
| commit | 3748be051e8947968e077ab74b51ab2cb79e0abf (patch) | |
| tree | ecf2d334026de928ac76375b09ca78c3a9e9dea7 /pkg_resources.py | |
| parent | d2716aa2a4a24fbe716c6b3c8d0ab2bb00177834 (diff) | |
| download | python-setuptools-bitbucket-3748be051e8947968e077ab74b51ab2cb79e0abf.tar.gz | |
convert "find_in_zip" into "find_eggs_in_zip" to prevent it from walking whl files
this specifically prevents a failure when wheels are nested under an egg dir
https://bitbucket.org/pypa/setuptools/issue/129
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index efe5d34d..39881b56 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1717,7 +1717,14 @@ def find_distributions(path_item, only=False): finder = _find_adapter(_distribution_finders, importer) return finder(importer, path_item, only) -def find_in_zip(importer, path_item, only=False): +def find_eggs_in_zip(importer, path_item, only=False): + """ + Find eggs in zip files; possibly multiple nested eggs. + """ + if importer.archive.endswith('.whl'): + # wheels are not supported with this finder + # they don't have PKG-INFO metadata, and won't ever contain eggs + return metadata = EggMetadata(importer) if metadata.has_metadata('PKG-INFO'): yield Distribution.from_filename(path_item, metadata=metadata) @@ -1726,10 +1733,10 @@ def find_in_zip(importer, path_item, only=False): for subitem in metadata.resource_listdir('/'): if subitem.endswith('.egg'): subpath = os.path.join(path_item, subitem) - for dist in find_in_zip(zipimport.zipimporter(subpath), subpath): + for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath): yield dist -register_finder(zipimport.zipimporter, find_in_zip) +register_finder(zipimport.zipimporter, find_eggs_in_zip) def find_nothing(importer, path_item, only=False): return () |