[svn r2585] fixed imports in setup.py

--HG--
branch : trunk

1 files changed, 1 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 0cebeb83..e08666ae 100644
--- a/setup.py
+++ b/setup.py
@@ -7,9 +7,8 @@ try:
     except pkg_resources.VersionConflict, e:
         from ez_setup import use_setuptools
         use_setuptools(version="0.6c5")
-    raise ImportError
     from setuptools import setup
-except ImportError:
+except (ImportError, NameError), e:
     # not setuptools installed
     from distutils.core import setup