Expose proper public imports and fix tests to match

Author: Tyler Goodlet

pluggy/__init__.py

@@ -3,7 +3,6 @@
 __all__ = ["PluginManager", "PluginValidationError", "HookCallError",
            "HookspecMarker", "HookimplMarker"]
 
-from .manager import *
-from .manager import _formatdef
-from .callers import _multicall, HookCallError, _Result, _legacymulticall
-from .hooks import HookspecMarker, HookimplMarker, _HookRelay, _HookCaller, varnames
+from .manager import PluginManager, PluginValidationError
+from .callers import HookCallError
+from .hooks import HookspecMarker, HookimplMarker

pluggy/manager.py

@@ -1,6 +1,5 @@
 import inspect
 from . import _tracing
-from .callers import _Result
 from .hooks import HookImpl, _HookRelay, _HookCaller, normalize_hookimpl_opts
 
 

testing/benchmark.py

@@ -2,8 +2,9 @@
 Benchmarking and performance tests.
 """
 import pytest
-from pluggy import (_multicall, _legacymulticall, HookImpl, HookspecMarker,
-                    HookimplMarker)
+from pluggy import HookspecMarker, HookimplMarker
+from pluggy.hooks import HookImpl
+from pluggy.callers import _multicall, _legacymulticall
 
 hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")

testing/test_details.py

@@ -1,8 +1,7 @@
 import warnings
-
 import pytest
-
-from pluggy import PluginManager, HookimplMarker, HookspecMarker, _Result
+from pluggy import PluginManager, HookimplMarker, HookspecMarker
+from pluggy.callers import _Result
 
 hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")

testing/test_helpers.py

@@ -1,4 +1,5 @@
-from pluggy import _formatdef, varnames
+from pluggy.hooks import varnames
+from pluggy.manager import _formatdef
 
 
 def test_varnames():

testing/test_method_ordering.py

@@ -1,10 +1,9 @@
 import pytest
-
-
 import sys
 import types
 
-from pluggy import PluginManager, HookImpl, HookimplMarker, HookspecMarker
+from pluggy import PluginManager, HookimplMarker, HookspecMarker
+from pluggy.hooks import HookImpl
 
 hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")

testing/test_multicall.py

@@ -1,8 +1,7 @@
 import pytest
-
-from pluggy import _multicall, _legacymulticall, HookImpl, HookCallError
-from pluggy.callers import _LegacyMultiCall
-from pluggy import HookspecMarker, HookimplMarker
+from pluggy import HookCallError, HookspecMarker, HookimplMarker
+from pluggy.hooks import HookImpl
+from pluggy.callers import _multicall, _legacymulticall, _LegacyMultiCall
 
 
 hookspec = HookspecMarker("example")

testing/test_pluginmanager.py

@@ -1,6 +1,5 @@
 import pytest
 import types
-
 from pluggy import (PluginValidationError,
                     HookCallError, HookimplMarker, HookspecMarker)
 

testing/test_tracer.py

@@ -1,4 +1,3 @@
-
 from pluggy._tracing import TagTracer
 
 import pytest