Changed tests/run.py so that it's possible to run the testsuite on python3 more easiely

2 files changed, 13 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 682f0366..593c7ad4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python -3
+PYTHON ?= python3
 
 export PYTHONPATH = $(shell echo "$$PYTHONPATH"):./sphinx
 
diff --git a/tests/run.py b/tests/run.py
index 0cb41442..5fd30d62 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -11,7 +11,16 @@
 """
 
 import sys
-from os import path
+from os import path, chdir
+
+if sys.version_info >= (3,):
+    print('Copying and converting sources to build/lib/test...')
+    from distutils.util import copydir_run_2to3
+    testroot = path.dirname(__file__) or '.'
+    newroot = path.join(testroot, path.pardir, 'build', 'lib', 'test')
+    copydir_run_2to3(testroot, newroot)
+    # switch to the converted dir so nose tests the right tests
+    chdir(newroot)
 
 # always test the sphinx package from this directory
 sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
@@ -19,8 +28,8 @@ sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
 try:
     import nose
 except ImportError:
-    print "The nose package is needed to run the Sphinx test suite."
+    print("The nose package is needed to run the Sphinx test suite.")
     sys.exit(1)
 
-print "Running Sphinx test suite..."
+print("Running Sphinx test suite...")
 nose.main()