From b94c3084a62833663272f4f1b1ef324d6255efa8 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Thu, 7 Feb 2013 10:41:07 +0100
Subject: [PATCH] small line length fix in nose plugin call optional

---
 _pytest/nose.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_pytest/nose.py b/_pytest/nose.py
index ef7b78183..d82247c2b 100644
--- 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()