From dc5219a9c008b3b77dfebd55b9924605c3a9a354 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 3 Mar 2020 21:15:06 +0100
Subject: [PATCH] Fix documentation for Config/InvocationParams

---
 src/_pytest/config/__init__.py | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
index f499a349a..ec3fc6afe 100644
--- a/src/_pytest/config/__init__.py
+++ b/src/_pytest/config/__init__.py
@@ -735,26 +735,19 @@ class Config:
     """
     Access to configuration values, pluginmanager and plugin hooks.
 
-    :ivar PytestPluginManager pluginmanager: the plugin manager handles plugin registration and hook invocation.
-
-    :ivar argparse.Namespace option: access to command line option as attributes.
-
-    :ivar InvocationParams invocation_params:
+    :param PytestPluginManager pluginmanager:
 
+    :param InvocationParams invocation_params:
         Object containing the parameters regarding the ``pytest.main``
         invocation.
-
-        Contains the following read-only attributes:
-
-        * ``args``: tuple of command-line arguments as passed to ``pytest.main()``.
-        * ``plugins``: list of extra plugins, might be None.
-        * ``dir``: directory where ``pytest.main()`` was invoked from.
     """
 
     @attr.s(frozen=True)
     class InvocationParams:
         """Holds parameters passed during ``pytest.main()``
 
+        The object attributes are read-only.
+
         .. versionadded:: 5.1
 
         .. note::
@@ -766,10 +759,18 @@ class Config:
         """
 
         args = attr.ib(converter=tuple)
+        """tuple of command-line arguments as passed to ``pytest.main()``."""
         plugins = attr.ib()
+        """list of extra plugins, might be `None`."""
         dir = attr.ib(type=Path)
+        """directory where ``pytest.main()`` was invoked from."""
 
-    def __init__(self, pluginmanager, *, invocation_params=None) -> None:
+    def __init__(
+        self,
+        pluginmanager: PytestPluginManager,
+        *,
+        invocation_params: InvocationParams = None
+    ) -> None:
         from .argparsing import Parser, FILE_OR_DIR
 
         if invocation_params is None:
@@ -778,6 +779,10 @@ class Config:
             )
 
         self.option = argparse.Namespace()
+        """access to command line option as attributes.
+
+          :type: argparse.Namespace"""
+
         self.invocation_params = invocation_params
 
         _a = FILE_OR_DIR
@@ -786,6 +791,10 @@ class Config:
             processopt=self._processopt,
         )
         self.pluginmanager = pluginmanager
+        """the plugin manager handles plugin registration and hook invocation.
+
+          :type: PytestPluginManager"""
+
         self.trace = self.pluginmanager.trace.root.get("config")
         self.hook = self.pluginmanager.hook
         self._inicache = {}  # type: Dict[str, Any]