summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-10-09 15:56:20 +0000
committerxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-10-09 15:56:20 +0000
commit2db597e2a0fb7fac099600dac1b95bcf47108eba (patch)
tree80126fc0391b11b68277320d9a2cf087fdf5f6b4
parentf5d103e0071b268834395892d2a3b33a9ccfe0e6 (diff)
downloadpyyaml-2db597e2a0fb7fac099600dac1b95bcf47108eba.tar.gz
Fixed the distutils script to run when installed using easy_install and Pyrex is available.
git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@298 18f92427-320e-0410-9341-c67f048884a3
-rw-r--r--setup.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 610e477..97cafc1 100644
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,8 @@ int main(void) {
"""
+import sys, os.path
+
from distutils import log
from distutils.core import setup, Command
from distutils.core import Distribution as _Distribution
@@ -57,6 +59,12 @@ from distutils.dir_util import mkpath
from distutils.command.build_ext import build_ext as _build_ext
from distutils.errors import CompileError, LinkError, DistutilsPlatformError
+if 'setuptools.extension' in sys.modules:
+ _Extension = sys.modules['setuptools.extension']._Extension
+ sys.modules['distutils.core'].Extension = _Extension
+ sys.modules['distutils.extension'].Extension = _Extension
+ sys.modules['distutils.command.build_ext'].Extension = _Extension
+
try:
from Pyrex.Distutils import Extension as _Extension
from Pyrex.Distutils import build_ext as _build_ext
@@ -64,7 +72,6 @@ try:
except ImportError:
with_pyrex = False
-import sys, os.path
class Distribution(_Distribution):