From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 1 May 2015 13:38:21 +0000 (-0400)
Subject: - Fixed an import that prevented "pypy setup.py test" from working
X-Git-Tag: rel_1_0_4~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=088666e8f3de4816b6eeadc2dce0f473b7710bff;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 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 778881b909..e66203ed34 100644
--- 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 14cf1eb31d..84b7a6d5e9 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