minor changes to get pyximport working

diff --git a/pyximport/Setup.py b/pyximport/Setup.py
index 513449ec1a7c11e2e4a8e4c4fd66ef02aa9f0a3a..53bbb504576217d9872a9a77dbce51b71ebe42df 100644 (file)
--- 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 3e987570440c5ee8442be5448762c7667143d8a9..73f873db5d45a5aeeb4e6e277843925f07468c78 100644 (file)
--- 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 0f7c941cae1824fd5879340f6cebc925f59a7267..e7c12bfcac3794957cb22d3a45f4690c6d7aa9b9 100644 (file)
--- 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)