Default to using setuptools by default, failing that setup.py will fall back to distutils

Signed-off-by: R. Tyler Ballance <tyler@slide.com>

1 files changed, 6 insertions, 21 deletions

diff --git a/SetupTools.py b/SetupTools.py
index d31853a..d6d48dd 100644
--- a/SetupTools.py
+++ b/SetupTools.py
@@ -1,15 +1,4 @@
 #!/usr/bin/env python
-# $Id: SetupTools.py,v 1.9 2007/11/03 19:44:38 tavis_rudd Exp $
-"""Some tools for extending and working with distutils
-
-CREDITS: This module borrows code and ideas from M.A. Lemburg's excellent setup
-tools for the mxBase package.
-
-"""
-
-__author__ = "Tavis Rudd <tavis@damnsimple.com>"
-__version__ = "$Revision: 1.9 $"[11:-2]
-
 import os
 from os import listdir
 import os.path
@@ -20,16 +9,12 @@ import string
 import traceback
 
 from distutils.core import setup
-if 'CHEETAH_USE_SETUPTOOLS' in os.environ:
-    # @@TR: Please note that this is for testing purposes only!  PEAK setuptools
-    # is not required or recommended for installing Cheetah.  Downstream
-    # package managers (linux distros, etc.) should *not* enable this.
-    try:
-        # use http://peak.telecommunity.com/DevCenter/setuptools if it's installed
-        # requires Py >=2.3
-        from setuptools import setup
-    except ImportError:   
-        from distutils.core import setup
+try:
+    # use http://peak.telecommunity.com/DevCenter/setuptools if it's installed
+    # requires Py >=2.3
+    from setuptools import setup
+except ImportError:   
+    from distutils.core import setup
 
 from distutils.core import Command
 from distutils.command.install_data import install_data