Drop wrapper module; import directly

_pytest/_pluggy.py

@@ -1,6 +0,0 @@
-"""
-Import symbols from ``pluggy``
-"""
-from __future__ import absolute_import, division, print_function
-from pluggy import *
-from pluggy import __version__

_pytest/config.py

@@ -14,7 +14,7 @@ import os
 import _pytest._code
 import _pytest.hookspec  # the extension point definitions
 import _pytest.assertion
-from _pytest._pluggy import PluginManager, HookimplMarker, HookspecMarker
+from pluggy import PluginManager, HookimplMarker, HookspecMarker
 from _pytest.compat import safe_str
 
 hookimpl = HookimplMarker("pytest")
@@ -165,7 +165,7 @@ def _prepareconfig(args=None, plugins=None):
 
 class PytestPluginManager(PluginManager):
     """
-    Overwrites :py:class:`pluggy.PluginManager <_pytest._pluggy.PluginManager>` to add pytest-specific
+    Overwrites :py:class:`pluggy.PluginManager <pluggy.PluginManager>` to add pytest-specific
     functionality:
 
     * loading plugins from the command line, ``PYTEST_PLUGIN`` env variable and
@@ -203,7 +203,7 @@ class PytestPluginManager(PluginManager):
         """
         .. deprecated:: 2.8
 
-        Use :py:meth:`pluggy.PluginManager.add_hookspecs <_pytest._pluggy.PluginManager.add_hookspecs>`
+        Use :py:meth:`pluggy.PluginManager.add_hookspecs <PluginManager.add_hookspecs>`
         instead.
         """
         warning = dict(code="I2",

_pytest/hookspec.py

@@ -1,6 +1,6 @@
 """ hook specifications for pytest plugins, invoked from main.py and builtin plugins.  """
 
-from _pytest._pluggy import HookspecMarker
+from pluggy import HookspecMarker
 
 hookspec = HookspecMarker("pytest")
 

_pytest/python.py

@@ -15,7 +15,7 @@ from _pytest.mark import MarkerError
 from _pytest.config import hookimpl
 
 import _pytest
-import _pytest._pluggy as pluggy
+import pluggy
 from _pytest import fixtures
 from _pytest import main
 from _pytest.compat import (

_pytest/terminal.py

@@ -13,8 +13,7 @@ import six
 import sys
 import time
 import platform
-
-import _pytest._pluggy as pluggy
+import pluggy
 
 
 def pytest_addoption(parser):

doc/en/writing_plugins.rst

@@ -454,7 +454,7 @@ hook wrappers and passes the same arguments as to the regular hooks.
 
 At the yield point of the hook wrapper pytest will execute the next hook
 implementations and return their result to the yield point in the form of
-a :py:class:`CallOutcome <_pytest._pluggy._CallOutcome>` instance which encapsulates a result or
+a :py:class:`CallOutcome <pluggy._CallOutcome>` instance which encapsulates a result or
 exception info.  The yield point itself will thus typically not raise
 exceptions (unless there are bugs).
 
@@ -519,7 +519,7 @@ Here is the order of execution:
    Plugin1).
 
 4. Plugin3's pytest_collection_modifyitems then executing the code after the yield
-   point.  The yield receives a :py:class:`CallOutcome <_pytest._pluggy._CallOutcome>` instance which encapsulates
+   point.  The yield receives a :py:class:`CallOutcome <pluggy._CallOutcome>` instance which encapsulates
    the result from calling the non-wrappers.  Wrappers shall not modify the result.
 
 It's possible to use ``tryfirst`` and ``trylast`` also in conjunction with
@@ -716,7 +716,7 @@ Reference of objects involved in hooks
     :members:
     :inherited-members:
 
-.. autoclass:: _pytest._pluggy._CallOutcome()
+.. autoclass:: pluggy._CallOutcome()
     :members:
 
 .. autofunction:: _pytest.config.get_plugin_manager()
@@ -726,7 +726,7 @@ Reference of objects involved in hooks
     :undoc-members:
     :show-inheritance:
 
-.. autoclass:: _pytest._pluggy.PluginManager()
+.. autoclass:: pluggy.PluginManager()
     :members:
 
 .. currentmodule:: _pytest.pytester

testing/test_terminal.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import, division, print_function
 import collections
 import sys
 
-import _pytest._pluggy as pluggy
+import pluggy
 import _pytest._code
 import py
 import pytest