Commit e09821eb authored by Reinout van Rees's avatar Reinout van Rees

Removed setuptools import for --allow-site-packages

The only effect of the import is that ez_setup's use_setuptools() function
does a sys.exit(2) when the required version doesn't match the site package's
one.

If the import doesn't happen, use_setuptools() will just grab a matching
version if the site package's version is too old.

Note that the latest ez_setup.py scripts default to requiring the very latest
setuptools version! So --allow-site-packages isn't really very useful this
way.
parent 7708fe6d
...@@ -75,12 +75,6 @@ try: ...@@ -75,12 +75,6 @@ try:
from urllib.request import urlopen from urllib.request import urlopen
except ImportError: except ImportError:
from urllib2 import urlopen from urllib2 import urlopen
if options.allow_site_packages:
try:
import setuptools
import pkg_resources
except ImportError:
pass
ez = {} ez = {}
if os.path.exists('ez_setup.py'): if os.path.exists('ez_setup.py'):
......
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