Merge https://github.com/snaury/cython

Cython/Distutils/build_ext.py

@@ -226,6 +226,8 @@ class build_ext(_build_ext.build_ext):
         if not self.inplace and (self.pyrex_c_in_temp
                 or getattr(extension, 'pyrex_c_in_temp', 0)):
             target_dir = os.path.join(self.build_temp, "pyrex")
+            for package_name in extension.name.split('.')[:-1]:
+                target_dir = os.path.join(target_dir, package_name)
         else:
             target_dir = None
 

pyximport/pyximport.py

@@ -112,6 +112,7 @@ def handle_special_build(modname, pyxfilename):
     return ext, setup_args
 
 def handle_dependencies(pyxfilename):
+    testing = '_test_files' in globals()
     dependfile = os.path.splitext(pyxfilename)[0] + PYXDEP_EXT
 
     # by default let distutils decide whether to rebuild on its own
@@ -132,7 +133,8 @@ def handle_dependencies(pyxfilename):
             files.extend(glob.glob(fullpath))
 
         # only for unit testing to see we did the right thing
-        _test_files[:] = []  #$pycheck_no
+        if testing:
+            _test_files[:] = []  #$pycheck_no
 
         # if any file that the pyxfile depends upon is newer than
         # the pyx file, 'touch' the pyx file so that distutils will
@@ -143,7 +145,8 @@ def handle_dependencies(pyxfilename):
                 print("Rebuilding because of ", file)
                 filetime = os.path.getmtime(file)
                 os.utime(pyxfilename, (filetime, filetime))
-                _test_files.append(file)
+                if testing:
+                    _test_files.append(file)
 
 def build_module(name, pyxfilename, pyxbuild_dir=None):
     assert os.path.exists(pyxfilename), (

pyximport/test/test_pyximport.py

-import pyximport; pyximport.install()
+import pyximport; pyximport.install(reload_support=True)
 import os, sys
 import time, shutil
 import tempfile
@@ -21,6 +21,7 @@ def on_remove_file_error(func, path, excinfo):
     print "You may want to delete this yourself when you get a chance."
 
 def test():
+    pyximport._test_files = []
     tempdir = make_tempdir()
     sys.path.append(tempdir)
     filename = os.path.join(tempdir, "dummy.pyx")