Skip to content

Commit 563ed10

Browse files
committed
Merge pull request #18 from tseaver/do_not_force_distribute
If setuptools is importable, don't force use of 'distribute'.
2 parents 63ab179 + a050932 commit 563ed10

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

setup.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import os
44
import sys
55

6-
from distribute_setup import use_setuptools
7-
use_setuptools()
6+
try:
7+
import setuptools
8+
except ImportError:
9+
from distribute_setup import use_setuptools
10+
use_setuptools()
811
from setuptools import setup, Extension
912

1013
if not hasattr(sys, "hexversion") or sys.hexversion < 0x02040000:

0 commit comments

Comments
 (0)