- Fixed an import that prevented "pypy setup.py test" from working

correctly.
fixes #3406

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 778881b909bba789a8709cf5a084e9b335d655a4..e66203ed343869d6cf0d3d08e2775229c0ca94e6 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,14 @@
 .. changelog::
     :version: 0.9.10
 
+    .. change::
+        :tags: bug, tests, pypy
+        :tickets: 3406
+        :versions: 1.0.4
+
+        Fixed an import that prevented "pypy setup.py test" from working
+        correctly.
+
     .. change::
         :tags: bug, engine
         :tickets: 3375

diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index 14cf1eb31dc315dc8e189321c2bb277b309d4bc5..84b7a6d5e9f15e3904fb6c605eef4f63d757907d 100644 (file)
--- 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