small line length fix in nose plugin call optional

2013-02-07 10:41:07 +01:00 · 2013-02-07 10:41:07 +01:00 · b94c3084a6
parent 9d107523a1
commit b94c3084a6
1 changed files with 2 additions and 1 deletions
--- a/_pytest/nose.py
+++ b/_pytest/nose.py
@ -41,7 +41,8 @@ def pytest_make_collect_report(collector):

 def call_optional(obj, name):
    method = getattr(obj, name, None)
-    if method is not None and not hasattr(method, "_pytestfixturefunction") and py.builtin.callable(method):
+    isfixture = hasattr(method, "_pytestfixturefunction")
+    if method is not None and not isfixture and py.builtin.callable(method):
        # If there's any problems allow the exception to raise rather than
        # silently ignoring them
        method()