From 088666e8f3de4816b6eeadc2dce0f473b7710bff Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 1 May 2015 09:38:21 -0400
Subject: - Fixed an import that prevented "pypy setup.py test" from working
 correctly. fixes #3406

---
 lib/sqlalchemy/testing/plugin/plugin_base.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/sqlalchemy/testing/plugin/plugin_base.py')

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
-- 
cgit v1.2.1