fixed 'python setup.py foo' if setuptools installed

astraw · astraw · commit fcaa2fbde4b8 · 2005-12-15T05:06:37.000Z
svn path=/trunk/matplotlib/; revision=1919
diff --git a/setup.py b/setup.py
@@ -58,12 +58,15 @@
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 
 try:
-    from setuptools.command import bdist_egg    
-    #from setuptools import setup # use setuptools if possible
+    # check if we have a reasonably recent copy of setuptools
+    from setuptools.command import bdist_egg 
     has_setuptools = True
 except ImportError:
     from distutils.core import setup
     has_setuptools = False
+
+if has_setuptools:
+    from setuptools import setup
     
 import sys,os
 import glob
