From a5b115b97ffed88cd7d159d944105bb748d44cf6 Mon Sep 17 00:00:00 2001 From: cookedm Date: Fri, 9 Jun 2006 09:54:34 +0000 Subject: Add patch for #141 from Andrew Straw: standard setuptools install idiom fails --- numpy/distutils/command/install.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'numpy/distutils/command') 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): -- cgit v1.2.1