From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 15 Sep 2014 18:53:20 +0000 (-0400)
Subject: - fix issue where nose Failure object comes into play here
X-Git-Tag: rel_0_9_8~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e856ed3cbaa741e27b178e970cf39f928ee0dfc;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix issue where nose Failure object comes into play here

Conflicts:
	lib/sqlalchemy/testing/plugin/noseplugin.py
---

diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py
index e362d61417..14955b3ae1 100644
--- a/lib/sqlalchemy/testing/plugin/noseplugin.py
+++ b/lib/sqlalchemy/testing/plugin/noseplugin.py
@@ -58,7 +58,7 @@ class NoseSQLAlchemy(Plugin):
         plugin_base.set_coverage_flag(options.enable_plugin_coverage)
 
         global fixtures
-        from sqlalchemy.testing import fixtures
+        from sqlalchemy.testing import fixtures  # noqa
 
     def begin(self):
         plugin_base.post_begin()
@@ -76,9 +76,12 @@ class NoseSQLAlchemy(Plugin):
         return plugin_base.want_class(cls)
 
     def beforeTest(self, test):
-        plugin_base.before_test(test,
-                                test.test.cls.__module__,
-                                test.test.cls, test.test.method.__name__)
+        if not hasattr(test.test, 'cls'):
+            return
+        plugin_base.before_test(
+            test,
+            test.test.cls.__module__,
+            test.test.cls, test.test.method.__name__)
 
     def afterTest(self, test):
         plugin_base.after_test(test)