[pypy-svn] r75151 - pypy/branch/fast-forward/pypy/tool/pytest/run-script

[benjamin at codespeak.net]

Author: benjamin
Date: Sun Jun  6 18:24:43 2010
New Revision: 75151

Modified:
   pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py
Log:
test_support.TestSkipped is now unittest.SkipTest

Modified: pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py
==============================================================================
--- pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py	(original)
+++ pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py	Sun Jun  6 18:24:43 2010
@@ -1,17 +1,18 @@
 # refer to 2.4.1/test/regrtest.py's runtest() for comparison
 import sys
+import unittest
 from test import test_support
 test_support.verbose = int(sys.argv[1])
 sys.argv[:] = sys.argv[2:]
 
-modname = sys.argv[0] 
+modname = sys.argv[0]
 impname = 'test.' + modname
 try:
     mod = __import__(impname, globals(), locals(), [modname])
     indirect_test = getattr(mod, 'test_main', None)
     if indirect_test is not None:
         indirect_test()
-except test_support.TestSkipped:
+except unittest.SkipTest:
     sys.stderr.write("="*26 + "skipped" + "="*26 + "\n")
     raise
-# else the test already ran during import 
+# else the test already ran during import