Fix path problems when pkg_resources is present, but not setuptools.

git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@88123 6015fed2-1504-0410-9fe1-9d1591cc4771

1 files changed, 4 insertions, 4 deletions

diff --git a/ez_setup.py b/ez_setup.py
index fd9d80f..b75265d 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -74,11 +74,11 @@ def use_setuptools(
             "\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,