merge with raichoo/pygments-main (pull request #210)

1 files changed, 14 insertions, 19 deletions

diff --git a/tests/run.py b/tests/run.py
index 18a1d824..e87837e5 100644
--- a/tests/run.py
+++ b/tests/run.py
@@ -8,42 +8,37 @@
         python run.py [testfile ...]
 
 
-    :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+from __future__ import print_function
+
 import sys, os
 
-if sys.version_info >= (3,):
-    # copy test suite over to "build/lib" and convert it
-    print ('Copying and converting sources to build/lib/test...')
-    from distutils.util import copydir_run_2to3
-    testroot = os.path.dirname(__file__)
-    newroot = os.path.join(testroot, '..', 'build/lib/test')
-    copydir_run_2to3(testroot, newroot)
-    # make nose believe that we run from the converted dir
-    os.chdir(newroot)
-else:
-    # only find tests in this directory
-    if os.path.dirname(__file__):
-        os.chdir(os.path.dirname(__file__))
+# only find tests in this directory
+if os.path.dirname(__file__):
+    os.chdir(os.path.dirname(__file__))
 
 
 try:
     import nose
 except ImportError:
-    print ('nose is required to run the Pygments test suite')
+    print('nose is required to run the Pygments test suite')
     sys.exit(1)
 
 try:
     # make sure the current source is first on sys.path
     sys.path.insert(0, '..')
     import pygments
-except ImportError:
-    print ('Cannot find Pygments to test: %s' % sys.exc_info()[1])
+except SyntaxError as err:
+    print('Syntax error: %s' % err)
+    sys.exit(1)
+except ImportError as err:
+    print('Cannot find Pygments to test: %s' % err)
     sys.exit(1)
 else:
-    print ('Pygments %s test suite running (Python %s)...' %
-           (pygments.__version__, sys.version.split()[0]))
+    print('Pygments %s test suite running (Python %s)...' %
+          (pygments.__version__, sys.version.split()[0]))
 
 nose.main()