diff options
| -rw-r--r-- | numpy/distutils/command/bdist_rpm.py | 5 | ||||
| -rw-r--r-- | numpy/distutils/command/sdist.py | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/numpy/distutils/command/bdist_rpm.py b/numpy/distutils/command/bdist_rpm.py index 593dfe878..60e9b5752 100644 --- a/numpy/distutils/command/bdist_rpm.py +++ b/numpy/distutils/command/bdist_rpm.py @@ -1,6 +1,9 @@ import os import sys -from distutils.command.bdist_rpm import bdist_rpm as old_bdist_rpm +if 'setuptools' in sys.modules: + from setuptools.command.bdist_rpm import bdist_rpm as old_bdist_rpm +else: + from distutils.command.bdist_rpm import bdist_rpm as old_bdist_rpm class bdist_rpm(old_bdist_rpm): diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py index 9134fed53..62fce9574 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,4 +1,9 @@ -from distutils.command.sdist import sdist as old_sdist +import sys +if 'setuptools' in sys.modules: + from setuptools.command.sdist import sdist as old_sdist +else: + from distutils.command.sdist import sdist as old_sdist + from numpy.distutils.misc_util import get_data_files class sdist(old_sdist): |