[Python-checkins] r88123 - sandbox/trunk/setuptools/ez_setup.py

Thu Jan 20 19:46:49 CET 2011

Author: phillip.eby
Date: Thu Jan 20 19:46:49 2011
New Revision: 88123
Log:
Fix path problems when pkg_resources is present, but not setuptools.
Modified:
 sandbox/trunk/setuptools/ez_setup.py
Modified: sandbox/trunk/setuptools/ez_setup.py
==============================================================================

--- sandbox/trunk/setuptools/ez_setup.py	(original)
+++ sandbox/trunk/setuptools/ez_setup.py	Thu Jan 20 19:46:49 2011
@@ -74,11 +74,11 @@
 "\n\n(Currently using %r)"
 ) % (version, e.args[0])
 sys.exit(2)
- else:
- del pkg_resources, sys.modules['pkg_resources'] # reload ok
- return do_download()
 except pkg_resources.DistributionNotFound:
- return do_download()
+ pass
+
+ del pkg_resources, sys.modules['pkg_resources'] # reload ok
+ return do_download()
 
 def download_setuptools(
 version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
