Commit d2ea054d authored by Yusuke Tsutsumi's avatar Yusuke Tsutsumi

Fixed bug with import blocking at wrong point

parent 9bcc9042
...@@ -72,21 +72,24 @@ ez = {} ...@@ -72,21 +72,24 @@ ez = {}
# XXX use a more permanent ez_setup.py URL when available. # XXX use a more permanent ez_setup.py URL when available.
exec(urlopen('https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py' exec(urlopen('https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py'
).read(), ez) ).read(), ez)
setup_args = dict(to_dir=tmpeggs, download_delay=0)
ez['use_setuptools'](**setup_args)
import setuptools
# ez_setup imports site, which adds site packages # ez_setup imports site, which adds site packages
# this will remove them to ensure that incompataible versions # this will remove them to ensure that incompataible versions
# of setuptools are not installed # of setuptools are not installed
import site import site
# inside a virtualenv, there is no 'getsitepackages'.
# We can't remove these reliably
if hasattr(site, 'getsitepackages'): if hasattr(site, 'getsitepackages'):
for sitepackage_path in site.getsitepackages(): for sitepackage_path in site.getsitepackages():
sys.path[:] = [x for x in sys.path if sitepackage_path not in x] sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
setup_args = dict(to_dir=tmpeggs, download_delay=0)
ez['use_setuptools'](**setup_args)
import setuptools
import pkg_resources import pkg_resources
# inside a virtualenv, there is no 'getsitepackages'.
# We can't remove these reliably
#if hasattr(site, 'getsitepackages'):
# for sitepackage_path in site.getsitepackages():
# sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
# This does not (always?) update the default working set. We will # This does not (always?) update the default working set. We will
# do it. # do it.
for path in sys.path: for path in sys.path:
......
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