From a050932372d7b94e8606caa0f242dd2ff4b77cfe Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Fri, 14 Jun 2013 13:34:07 -0400
Subject: If setuptools is importable, don't force use of 'distribute'.

Allows use of post-merge setuptools 0.7.
---
 setup.py | 7 +++++--
 1 file 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:
-- 
cgit v1.2.1