From 35f7f3d74fd9443724377e29df5970adc4d6c517 Mon Sep 17 00:00:00 2001 From: Robert Bradshaw Date: Fri, 11 Sep 2009 19:10:18 -0700 Subject: [PATCH] Python 3 fixes --- Cython/Shadow.py | 6 +++++- Cython/__init__.py | 2 +- pyximport/pyximport.py | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Cython/Shadow.py b/Cython/Shadow.py index 1fe9dc19..f943e6a8 100644 --- a/Cython/Shadow.py +++ b/Cython/Shadow.py @@ -151,8 +151,12 @@ class typedef(CythonType): py_int = int -py_long = long py_float = float +try: + py_long = long +except NameError: + # Python 3 + pass # Predefined types diff --git a/Cython/__init__.py b/Cython/__init__.py index 5ef285c0..f9f635d1 100644 --- a/Cython/__init__.py +++ b/Cython/__init__.py @@ -1,2 +1,2 @@ # Void cython.* directives (for case insensitive operating systems). -from Shadow import * +from Cython.Shadow import * diff --git a/pyximport/pyximport.py b/pyximport/pyximport.py index 42e397ff..f12e100b 100644 --- a/pyximport/pyximport.py +++ b/pyximport/pyximport.py @@ -117,7 +117,7 @@ def handle_dependencies(pyxfilename): # be tricked into rebuilding it. for file in files: if newer(file, pyxfilename): - print "Rebuilding because of ", file + print("Rebuilding because of ", file) filetime = os.path.getmtime(file) os.utime(pyxfilename, (filetime, filetime)) _test_files.append(file) @@ -141,7 +141,7 @@ def build_module(name, pyxfilename, pyxbuild_dir=None): try: os.remove(path) except IOError: - print "Couldn't remove ", path + print("Couldn't remove ", path) return so_path @@ -168,7 +168,7 @@ class PyxImporter(object): if fullname in sys.modules: return None if DEBUG_IMPORT: - print "SEARCHING", fullname, package_path + print("SEARCHING", fullname, package_path) if '.' in fullname: mod_parts = fullname.split('.') package = '.'.join(mod_parts[:-1]) @@ -226,7 +226,7 @@ class PyImporter(PyxImporter): # prevent infinite recursion return None if DEBUG_IMPORT: - print "trying import of module %s" % fullname + print("trying import of module", fullname) if fullname in self.uncompilable_modules: path, last_modified = self.uncompilable_modules[fullname] try: @@ -243,7 +243,7 @@ class PyImporter(PyxImporter): importer = self.super.find_module(fullname, package_path) if importer is not None: if DEBUG_IMPORT: - print "importer found" + print("importer found") try: if importer.init_path: path = importer.init_path -- 2.26.2