From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Sat, 16 Aug 2008 10:06:03 +0000 (-0700)
Subject: minor changes to get pyximport working
X-Git-Tag: 0.9.8.1~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=faf0574bd5c3fe19342923c9ad83725f381bd14c;p=cython.git

minor changes to get pyximport working
---

diff --git a/pyximport/Setup.py b/pyximport/Setup.py
index 513449ec..53bbb504 100644
--- a/pyximport/Setup.py
+++ b/pyximport/Setup.py
@@ -24,12 +24,12 @@ setup(
     url = "http://www.prescod.net/pyximport",
     license = "Python",
     keywords = "pyrex import hook",
-    scripts = ["pyxrun"],
-    data_files = [("examples/multi_file_extension", 
-		  ["README", "ccode.c", "test.pyx", "test.pyxbld"]),
-		 ("examples/dependencies",
-		  ["README", "test.pyx", "test.pyxdep", "header.h",
-			"header2.h", "header3.h", "header4.h"])
-		],
+#    scripts = ["pyxrun"],
+#    data_files = [("examples/multi_file_extension", 
+#         ["README", "ccode.c", "test.pyx", "test.pyxbld"]),
+#       ("examples/dependencies",
+#         ["README", "test.pyx", "test.pyxdep", "header.h",
+#           "header2.h", "header3.h", "header4.h"])
+#		],
     py_modules = ["pyximport", "pyxbuild"])
 
diff --git a/pyximport/pyxbuild.py b/pyximport/pyxbuild.py
index 3e987570..73f873db 100644
--- a/pyximport/pyxbuild.py
+++ b/pyximport/pyxbuild.py
@@ -10,7 +10,7 @@ from distutils.dist import Distribution
 from distutils.errors import DistutilsArgError, DistutilsError, CCompilerError
 from distutils.extension import Extension
 from distutils.util import grok_environment_error
-from Pyrex.Distutils import build_ext
+from Cython.Distutils import build_ext
 import shutil
 
 DEBUG = 0
diff --git a/pyximport/pyximport.py b/pyximport/pyximport.py
index 0f7c941c..e7c12bfc 100644
--- a/pyximport/pyximport.py
+++ b/pyximport/pyximport.py
@@ -55,7 +55,7 @@ def _load_pyrex(name, filename):
 def get_distutils_extension(modname, pyxfilename):
 
     extra = "_" + md5.md5(open(pyxfilename).read()).hexdigest()  
-    modname = modname + extra
+#    modname = modname + extra
 
     extension_mod = handle_special_build(modname, pyxfilename)