summaryrefslogtreecommitdiff
path: root/numpy/distutils/command/install.py
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2006-06-09 09:54:34 +0000
committercookedm <cookedm@localhost>2006-06-09 09:54:34 +0000
commita5b115b97ffed88cd7d159d944105bb748d44cf6 (patch)
tree1dfbb4b815e19fa0de2837db5e228bb3419f0101 /numpy/distutils/command/install.py
parentd4ea24a49b077407a991afc1475a61dbd5e19335 (diff)
downloadnumpy-a5b115b97ffed88cd7d159d944105bb748d44cf6.tar.gz
Add patch for #141 from Andrew Straw: standard setuptools install idiom fails
Diffstat (limited to 'numpy/distutils/command/install.py')
-rw-r--r--numpy/distutils/command/install.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py
index 3803363fe..36e6b5a66 100644
--- a/numpy/distutils/command/install.py
+++ b/numpy/distutils/command/install.py
@@ -1,4 +1,9 @@
-from distutils.command.install import install as old_install
+import sys
+if 'setuptools' in sys.modules:
+ import setuptools.command.install as old_install_mod
+else:
+ import distutils.command.install as old_install_mod
+old_install = old_install_mod.install
from distutils.file_util import write_file
class install(old_install):