Works with zope.interface now.

--HG--
branch : distribute
extra : rebase_source : c8cd9fd837bbac96c8949f0015d84051bd8ab5c7

1 files changed, 22 insertions, 6 deletions

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index db918dae..0f96e83a 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,4 +1,4 @@
-from setuptools import Command
+from setuptools import Command, run_2to3
 from distutils.errors import DistutilsOptionError
 import sys
 from pkg_resources import *
@@ -81,12 +81,28 @@ class test(Command):
 
 
     def with_project_on_sys_path(self, func):
-        # Ensure metadata is up-to-date
-        self.run_command('egg_info')
+        if getattr(self.distribution, 'run_2to3', run_2to3):
+            # If we run 2to3 we can not do this inplace:
 
-        # Build extensions in-place
-        self.reinitialize_command('build_ext', inplace=1)
-        self.run_command('build_ext')
+            # Ensure metadata is up-to-date
+            self.reinitialize_command('build_py', inplace=0)
+            self.run_command('build_py')
+            bpy_cmd = self.get_finalized_command("build_py")
+            build_path = normalize_path(bpy_cmd.build_lib)
+
+            # Build extensions
+            self.reinitialize_command('egg_info', egg_base=build_path)
+            self.run_command('egg_info')
+
+            self.reinitialize_command('build_ext', inplace=0)
+            self.run_command('build_ext')
+        else:
+            # Without 2to3 inplace works fine:
+            self.run_command('egg_info')
+
+            # Build extensions in-place
+            self.reinitialize_command('build_ext', inplace=1)
+            self.run_command('build_ext')
 
         ei_cmd = self.get_finalized_command("egg_info")