summaryrefslogtreecommitdiff
path: root/_pytest/nose.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2014-10-08 20:23:40 +0200
committerholger krekel <holger@merlinux.eu>2014-10-08 20:23:40 +0200
commit0253f7b8d5d66e3328f685ba12bedc10315c5e24 (patch)
tree96da9b0a2f620588c827dc8efa77ae8f94850403 /_pytest/nose.py
parentf5f924d293ed65ea62a66ad39d2c8074e575f2c4 (diff)
downloadpytest-0253f7b8d5d66e3328f685ba12bedc10315c5e24.tar.gz
remove all occurences of "__multicall__" on hook impls in pytest/*.
also simplify pytest_runtest_markereport hook in _pytest/skipping.py while touching the code anyway.
Diffstat (limited to '_pytest/nose.py')
-rw-r--r--_pytest/nose.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/_pytest/nose.py b/_pytest/nose.py
index 203db9850..089807b66 100644
--- a/_pytest/nose.py
+++ b/_pytest/nose.py
@@ -16,7 +16,7 @@ def get_skip_exceptions():
return tuple(skip_classes)
-def pytest_runtest_makereport(__multicall__, item, call):
+def pytest_runtest_makereport(item, call):
if call.excinfo and call.excinfo.errisinstance(get_skip_exceptions()):
# let's substitute the excinfo with a pytest.skip one
call2 = call.__class__(lambda: