use_setuptools TypeError catch

git-svn-id: http://simplejson.googlecode.com/svn/trunk@56 a4795897-2c25-0410-b006-0d3caba88fa1

1 files changed, 6 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index d4507a6..5b0c57f 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,12 @@ if 'cygwin' in sys.platform.lower():
    min_version='0.6c6'
 else:
    min_version='0.6a9'
-use_setuptools(min_version=min_version)
+try:
+    use_setuptools(min_version=min_version)
+except TypeError:
+    # If a non-local ez_setup is already imported, it won't be able to
+    # use the min_version kwarg and will bail with TypeError
+    use_setuptools()
 
 from setuptools import setup, find_packages, Extension, Feature
 from distutils.command.build_ext import build_ext