Merge pull request softlayer#131 from CrackerJackMack/setup-fix

sudorandom · sudorandom · commit 3f1eeb592d0d · 2013-07-22T13:32:59.000-07:00
Make setup more sane around 2to3
diff --git a/setup.py b/setup.py
@@ -1,9 +1,12 @@
+import sys
+import os
+
 try:
     from setuptools import setup
 except ImportError:
-    from distutils.core import setup  # NOQA
-import sys
-import os
+    print("Distribute is required for install:")
+    print("    http://python-distribute.org/distribute_setup.py")
+    sys.exit(1)
 
 # Not supported for Python versions < 2.6
 if sys.version_info <= (2, 6):
@@ -16,7 +19,6 @@
     extra['use_2to3'] = True
 
 requires = [
-    'distribute',
     'prettytable >= 0.7.0',
     'docopt == 0.6.1',
     'requests'
