From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 4 Mar 2014 17:58:14 +0000 (-0500)
Subject: - no unitest.SkipTest in 2.6...arggggg
X-Git-Tag: rel_0_9_4~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81783a6241c5251975e814973811c8a2c2d8412d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- no unitest.SkipTest in 2.6...arggggg
---

diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index 50efdfcf0c..6a2814109e 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