From 9ab83083d162fcde13d60b1e1709fbbd14449a4b Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Thu, 24 Aug 2017 16:53:37 -0400 Subject: [PATCH] Update docs --- _pytest/config.py | 4 ++-- doc/en/writing_plugins.rst | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_pytest/config.py b/_pytest/config.py index dedffd5a6..2fcbe9a09 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -165,7 +165,7 @@ def _prepareconfig(args=None, plugins=None): class PytestPluginManager(PluginManager): """ - Overwrites :py:class:`pluggy.PluginManager <_pytest.vendored_packages.pluggy.PluginManager>` to add pytest-specific + Overwrites :py:class:`pluggy.PluginManager <_pytest._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.vendored_packages.pluggy.PluginManager.add_hookspecs>` + Use :py:meth:`pluggy.PluginManager.add_hookspecs <_pytest._pluggy.PluginManager.add_hookspecs>` instead. """ warning = dict(code="I2", diff --git a/doc/en/writing_plugins.rst b/doc/en/writing_plugins.rst index d5ad73b4b..6e96fe7c4 100644 --- a/doc/en/writing_plugins.rst +++ b/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.vendored_packages.pluggy._CallOutcome>` instance which encapsulates a result or +a :py:class:`CallOutcome <_pytest._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.vendored_packages.pluggy._CallOutcome>` instance which encapsulates + point. The yield receives a :py:class:`CallOutcome <_pytest._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.vendored_packages.pluggy._CallOutcome() +.. autoclass:: _pytest._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.vendored_packages.pluggy.PluginManager() +.. autoclass:: _pytest._pluggy.PluginManager() :members: .. currentmodule:: _pytest.pytester