Skip to content
Snippets Groups Projects
Commit 3b0a98e394b1 authored by Bob Ippolito's avatar Bob Ippolito
Browse files

use_setuptools TypeError catch

git-svn-id: http://simplejson.googlecode.com/svn/trunk@56 a4795897-2c25-0410-b006-0d3caba88fa1
parent acc163ae9806
Branches
No related tags found
No related merge requests found
...@@ -6,4 +6,5 @@ ...@@ -6,4 +6,5 @@
min_version='0.6c6' min_version='0.6c6'
else: else:
min_version='0.6a9' min_version='0.6a9'
try:
use_setuptools(min_version=min_version) use_setuptools(min_version=min_version)
...@@ -9,4 +10,8 @@ ...@@ -9,4 +10,8 @@
use_setuptools(min_version=min_version) 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 setuptools import setup, find_packages, Extension, Feature
from distutils.command.build_ext import build_ext from distutils.command.build_ext import build_ext
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment