WIP: fix rebase artifacts

src/pluggy/_callers.py

@@ -7,9 +7,10 @@
 import warnings
 
 from ._hooks import HookImpl
-from ._result import _raise_wrapfail
 from ._result import HookCallError
 from ._result import Result
+from ._warnings import PluggyTeardownRaisedWarning
+
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -21,25 +22,17 @@
  from typing import Tuple
  from typing import Union
 
-
  # Need to distinguish between old- and new-style hook wrappers.
  # Wrapping with a tuple is the fastest type-safe way I found to do it.
  Teardown = Union[
  Tuple[Generator[None, Result[object], None], HookImpl],
- Generator[None, object, object],
-]
+  Generator[None, object, object],
+ ]
 else:
 
  def cast(t, v):
  return v
 
-from ._hooks import HookImpl
-from ._result import HookCallError
-from ._result import Result
-from ._warnings import PluggyTeardownRaisedWarning
-
-
-
 
 def _raise_wrapfail(
  wrap_controller: (

src/pluggy/_hooks.py

@@ -7,6 +7,7 @@
 import sys
 import warnings
 
+
 _Plugin = object
 
 TYPE_CHECKING = False
@@ -383,12 +384,11 @@ def __getattr__(self, name: str) -> HookCaller: ...
 
  _CallHistory = List[Tuple[Mapping[str, object], Optional[Callable[[Any], None]]]]
 
+
 # Historical name (pluggy<=1.2), kept for backward compatibility.
 _HookRelay = HookRelay
 
 
-
-
 class HookCaller:
  """A caller of all registered implementations of a hook specification."""
 

src/pluggy/_importlib_metadata.py

@@ -9,6 +9,7 @@
 
 
 """
+
 from __future__ import annotations
 
 import importlib.metadata

src/pluggy/_manager.py

@@ -16,20 +16,19 @@
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
- from ._hooks import HookimplOpts
- from ._hooks import HookspecOpts
-
- from ._hooks import _HookImplFunction
- from ._hooks import _Namespace
-
+ from importlib.metadata import Distribution
  from typing import Any
  from typing import Callable
  from typing import Final
  from typing import Iterable
  from typing import Mapping
  from typing import Sequence
  from typing import TypeAlias
- from importlib.metadata import Distribution
+
+ from ._hooks import _HookImplFunction
+ from ._hooks import _Namespace
+ from ._hooks import HookimplOpts
+ from ._hooks import HookspecOpts
  from ._importlib_metadata import DistFacade
 
 _BeforeTrace: TypeAlias = "Callable[[str, Sequence[HookImpl], Mapping[str, Any]], None]"

src/pluggy/_result.py

@@ -4,14 +4,14 @@
 
 from __future__ import annotations
 
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
  from types import TracebackType
  from typing import Callable
  from typing import cast
  from typing import final
- from typing import Generic
-
+ from typing import Generic
  from typing import Optional
  from typing import Tuple
  from typing import Type

src/pluggy/_tracing.py

@@ -4,9 +4,14 @@
 
 from __future__ import annotations
 
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
- from typing import Sequence, TypeAlias, Callable, Any, Tuple
+ from typing import Any
+ from typing import Callable
+ from typing import Sequence
+ from typing import Tuple
+ from typing import TypeAlias
 
 
 _Writer: TypeAlias = "Callable[[str], object]"