[Lxml-checkins] r44698 - lxml/trunk

[scoder at codespeak.net]

Author: scoder
Date: Tue Jul  3 15:08:23 2007
New Revision: 44698

Modified:
   lxml/trunk/setup.py
Log:
fixed imports in setup.py

Modified: lxml/trunk/setup.py
==============================================================================
--- lxml/trunk/setup.py	(original)
+++ lxml/trunk/setup.py	Tue Jul  3 15:08:23 2007
@@ -7,9 +7,8 @@
     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