End-to-end fixes.

diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py
index 857bdbec9dee9fcd7c237ce7376fe04195ddeae7..98d6051d9453e56d191ced100f78f5e21fcb32e0 100644 (file)
--- a/Cython/Build/Dependencies.py
+++ b/Cython/Build/Dependencies.py
@@ -273,7 +273,7 @@ class DependencyTree(object):
                 cimports.update(a)
                 externs.update(b)
             else:
-                print "Unable to locate '%s' referenced from '%s'" % (filename, include)
+                print("Unable to locate '%s' referenced from '%s'" % (filename, include))
         return tuple(cimports), tuple(externs)
     cimports_and_externs = cached_method(cimports_and_externs)
     
@@ -304,6 +304,7 @@ class DependencyTree(object):
             if pxd:
                 return pxd
         return self.context.find_pxd_file(module, None)
+    find_pxd = cached_method(find_pxd)
         
     #@cached_method
     def cimported_files(self, filename):
@@ -429,7 +430,9 @@ def create_extension_list(patterns, ctx=None, aliases=None):
     return module_list
 
 # This is the user-exposed entry point.
-def cythonize(module_list, nthreads=0, aliases=None, **options):    
+def cythonize(module_list, nthreads=0, aliases=None, **options):
+    if 'include_path' not in options:
+        options['include_path'] = ['.']
     c_options = CompilationOptions(**options)
     cpp_options = CompilationOptions(**options); cpp_options.cplus = True
     ctx = c_options.create_context()

diff --git a/runtests.py b/runtests.py
index 5f798757452daf966dc63484686a789a2c0d183e..579230c5da849cfa643aa364cce5ba3ca98b2429 100644 (file)
--- a/runtests.py
+++ b/runtests.py
@@ -732,7 +732,7 @@ class EndToEndTest(unittest.TestCase):
             .replace("PYTHON", sys.executable))
         try:
             old_path = os.environ.get('PYTHONPATH')
-            os.environ['PYTHONPATH'] = os.path.join(self.cython_syspath, (old_path or ''))
+            os.environ['PYTHONPATH'] = self.cython_syspath + os.pathsep + os.path.join(self.cython_syspath, (old_path or ''))
             for command in commands.split('\n'):
                 if sys.version_info[:2] >= (2,4):
                     import subprocess