Commits

Mike Bayer committed 66338e3

unitttest has a SkipTest also but pytest doesn't
honor it unless nose is imported too...

Comments (0)

Files changed (1)

lib/sqlalchemy/testing/plugin/plugin_base.py

 
 from __future__ import absolute_import
 try:
-    # needs 2.7...
-    from unittest import SkipTest
+    # unitttest has a SkipTest also but pytest doesn't
+    # honor it unless nose is imported too...
+    from nose import SkipTest
 except ImportError:
-    try:
-        from nose import SkipTest
-    except ImportError:
-        from _pytest.runner import Skipped as SkipTest
+    from _pytest.runner import Skipped as SkipTest
 
 import sys
 import re