[Numpy-svn] r3955 - trunk/numpy/distutils/command

numpy-svn@scip... numpy-svn@scip...
Wed Aug 8 17:31:54 CDT 2007


Author: rkern
Date: 2007-08-08 17:31:50 -0500 (Wed, 08 Aug 2007)
New Revision: 3955

Modified:
   trunk/numpy/distutils/command/bdist_rpm.py
   trunk/numpy/distutils/command/sdist.py
Log:
Optionally use setuptools for commands that setuptools customizes.

Modified: trunk/numpy/distutils/command/bdist_rpm.py
===================================================================
--- trunk/numpy/distutils/command/bdist_rpm.py	2007-08-07 11:39:58 UTC (rev 3954)
+++ trunk/numpy/distutils/command/bdist_rpm.py	2007-08-08 22:31:50 UTC (rev 3955)
@@ -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):
 

Modified: trunk/numpy/distutils/command/sdist.py
===================================================================
--- trunk/numpy/distutils/command/sdist.py	2007-08-07 11:39:58 UTC (rev 3954)
+++ trunk/numpy/distutils/command/sdist.py	2007-08-08 22:31:50 UTC (rev 3955)
@@ -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):



More information about the Numpy-svn mailing list