diff --git a/src/pluggy/hooks.py b/src/pluggy/hooks.py index ddc41633..a295b49f 100644 --- a/src/pluggy/hooks.py +++ b/src/pluggy/hooks.py @@ -4,7 +4,6 @@ import inspect import sys import warnings -from .callers import _multicall class HookspecMarker(object): @@ -212,7 +211,6 @@ def __init__(self, name, hook_execute, specmodule_or_class=None, spec_opts=None) self._hookexec = hook_execute self.argnames = None self.kwargnames = None - self.multicall = _multicall self.spec = None if specmodule_or_class is not None: assert spec_opts is not None diff --git a/src/pluggy/manager.py b/src/pluggy/manager.py index 22dd78d6..6677a440 100644 --- a/src/pluggy/manager.py +++ b/src/pluggy/manager.py @@ -1,7 +1,7 @@ import inspect import sys from . import _tracing -from .callers import _Result +from .callers import _Result, _multicall from .hooks import HookImpl, _HookRelay, _HookCaller, normalize_hookimpl_opts import warnings @@ -81,7 +81,7 @@ def __init__(self, project_name, implprefix=None): stacklevel=2, ) self._implprefix = implprefix - self._inner_hookexec = lambda hook, methods, kwargs: hook.multicall( + self._inner_hookexec = lambda hook, methods, kwargs: _multicall( methods, kwargs, firstresult=hook.spec.opts.get("firstresult") if hook.spec else False,