Commit 60f18d3c authored by PJ Eby's avatar PJ Eby

Correctly recognize .egg files that are already on sys.path (or whatever

path AvailableDistributions is scanning)

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041021
parent b7516405
......@@ -755,6 +755,15 @@ def find_distributions(path_item):
return finder(importer,path_item)
def find_in_zip(importer,path_item):
# for now, we only yield the .egg file itself, if applicable;
# i.e., we don't support "baskets" yet, just eggs
for item in find_on_path(importer,path_item):
yield item
register_finder(zipimport.zipimporter,find_in_zip)
def StringIO(*args, **kw):
"""Thunk to load the real StringIO on demand"""
global StringIO
......@@ -770,13 +779,6 @@ def StringIO(*args, **kw):
def find_nothing(importer,path_item):
return ()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment