diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-05-01 09:38:21 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-05-01 09:38:21 -0400 |
| commit | 088666e8f3de4816b6eeadc2dce0f473b7710bff (patch) | |
| tree | a6a13d118ec7366129038b324b933853170a85a6 /lib/sqlalchemy/testing/plugin/plugin_base.py | |
| parent | 24d6ea362e757c79b3bada663cf6fc9f262dae4f (diff) | |
| download | sqlalchemy-088666e8f3de4816b6eeadc2dce0f473b7710bff.tar.gz | |
- Fixed an import that prevented "pypy setup.py test" from working
correctly.
fixes #3406
Diffstat (limited to 'lib/sqlalchemy/testing/plugin/plugin_base.py')
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/plugin_base.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 14cf1eb31..84b7a6d5e 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -19,6 +19,7 @@ try: # honor it unless nose is imported too... from nose import SkipTest except ImportError: + import pytest from _pytest.runner import Skipped as SkipTest import sys |