diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | nose/util.py | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -3,6 +3,7 @@ Under Development - Fixed #782: Test failures with Python >= 3.3 Patch by Dmitry Shachnev. - Fixed #780: Fix a regression with Python 3 +- Fixed #783: try_run is broken with Python 3.4 1.3.1 diff --git a/nose/util.py b/nose/util.py index 7995700..dcb5fef 100644 --- a/nose/util.py +++ b/nose/util.py @@ -8,7 +8,7 @@ import re import sys import types import unittest -from nose.pyversion import ClassType, TypeType, isgenerator +from nose.pyversion import ClassType, TypeType, isgenerator, ismethod log = logging.getLogger('nose') @@ -449,6 +449,8 @@ def try_run(obj, names): # py.test compatibility try: args, varargs, varkw, defaults = inspect.getargspec(func) + if hasattr(func, '__call__') and ismethod(func.__call__): + args.pop(0) except TypeError: # Not a function. If it's callable, call it anyway if hasattr(func, '__call__'): |