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.

1 files changed, 4 insertions, 3 deletions

diff --git a/_pytest/pastebin.py b/_pytest/pastebin.py
index cc9d0b5f0..4151fbf0d 100644
--- a/_pytest/pastebin.py
+++ b/_pytest/pastebin.py
@@ -1,5 +1,7 @@
 """ submit failure or test session information to a pastebin service. """
+import pytest
 import py, sys
+import tempfile
 
 class url:
     base = "http://bpaste.net"
@@ -13,9 +15,8 @@ def pytest_addoption(parser):
         choices=['failed', 'all'],
         help="send failed|all info to bpaste.net pastebin service.")
 
-def pytest_configure(__multicall__, config):
-    import tempfile
-    __multicall__.execute()
+@pytest.mark.trylast
+def pytest_configure(config):
     if config.option.pastebin == "all":
         config._pastebinfile = tempfile.TemporaryFile('w+')
         tr = config.pluginmanager.getplugin('terminalreporter')