diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-04 12:58:14 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-04 12:58:14 -0500 |
| commit | 81783a6241c5251975e814973811c8a2c2d8412d (patch) | |
| tree | 972c239f0fabaf486b709c47a43b657e3cdd36a3 | |
| parent | c6f540da58a63485344894dbe02ad40d26c5ce7c (diff) | |
| download | sqlalchemy-81783a6241c5251975e814973811c8a2c2d8412d.tar.gz | |
- no unitest.SkipTest in 2.6...arggggg
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/plugin_base.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 50efdfcf0..6a2814109 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -13,7 +13,15 @@ via py.test. """ from __future__ import absolute_import -from unittest import SkipTest +try: + # needs 2.7... + from unittest import SkipTest +except ImportError: + try: + from nose import SkipTest + except ImportError: + from _pytest.runner import Skipped as SkipTest + import sys import re |