diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/testing/exclusions.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/plugin_base.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py index 9a713adaa..bcd593708 100644 --- a/lib/sqlalchemy/testing/exclusions.py +++ b/lib/sqlalchemy/testing/exclusions.py @@ -6,7 +6,7 @@ import operator -from nose import SkipTest +from .plugin.plugin_base import SkipTest from ..util import decorator from . import config from .. import util @@ -98,7 +98,7 @@ class Predicate(object): @classmethod def as_predicate(cls, predicate): if isinstance(predicate, skip_if): - return predicate.predicate + return NotPredicate(predicate.predicate) elif isinstance(predicate, Predicate): return predicate elif isinstance(predicate, list): diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 6a2814109..b8a0fae96 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -114,7 +114,6 @@ def post_begin(): global util, fixtures, engines, exclusions, \ assertions, warnings, profiling,\ config, testing - from sqlalchemy import testing from sqlalchemy.testing import fixtures, engines, exclusions, \ assertions, warnings, profiling, config from sqlalchemy import util |