summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Dustman <farcepest@gmail.com>2013-08-18 14:19:53 -0700
committerAndy Dustman <farcepest@gmail.com>2013-08-18 14:19:53 -0700
commit563ed107332359dc1506a25d4b14862c1f5a8002 (patch)
tree388d711f29ab85e65beb17aadb36dc01d3e3e1a8
parent63ab17980da8b31ca02ad31236420ed57006e315 (diff)
parenta050932372d7b94e8606caa0f242dd2ff4b77cfe (diff)
downloadmysqldb1-563ed107332359dc1506a25d4b14862c1f5a8002.tar.gz
Merge pull request #18 from tseaver/do_not_force_distribute
If setuptools is importable, don't force use of 'distribute'.
-rw-r--r--setup.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 798f96f..e2dee0f 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,11 @@
import os
import sys
-from distribute_setup import use_setuptools
-use_setuptools()
+try:
+ import setuptools
+except ImportError:
+ from distribute_setup import use_setuptools
+ use_setuptools()
from setuptools import setup, Extension
if not hasattr(sys, "hexversion") or sys.hexversion < 0x02040000: