setuptools fixes

1 files changed, 11 insertions, 9 deletions

diff --git a/setup.py b/setup.py
index 86e8a2aeb..1e93b7728 100644
--- a/setup.py
+++ b/setup.py
@@ -15,17 +15,19 @@ from os.path import isdir, exists, join, walk
 
 # FIXME : setup.py doesn't work with setuptools so we use distutils
 
-#try:
-    #from setuptools import setup
-    #from setuptools.command import install_lib
-    #USE_SETUPTOOLS = 1
-#except ImportError:    
-from distutils.core import setup
-from distutils.command import install_lib
-USE_SETUPTOOLS = 0
-
+try:
+    if os.environ.get('NO_SETUPTOOLS'):
+        raise ImportError()
+    from setuptools import setup
+    from setuptools.command import install_lib
+    USE_SETUPTOOLS = 1
+except ImportError:    
+    from distutils.core import setup
+    from distutils.command import install_lib
+    USE_SETUPTOOLS = 0
 #assert USE_SETUPTOOLS
 
+sys.modules.pop('__pkginfo__', None)
 # import required features
 from __pkginfo__ import modname, version, license, short_desc, long_desc, \
      web, author, author_email, classifiers