Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-03-16 18:15:28 -03:00
parent cbb2c55dea 93847bfeb4
commit 1fff81e21d
45 changed files with 1455 additions and 724 deletions
--- a/_pytest/python_api.py
+++ b/_pytest/python_api.py
@@ -548,8 +548,9 @@ def raises(expected_exception, *args, **kwargs):
    The string will be evaluated using the same ``locals()`` and ``globals()``
    at the moment of the ``raises`` call.

-    .. autoclass:: _pytest._code.ExceptionInfo
-        :members:
+    .. currentmodule:: _pytest._code
+
+    Consult the API of ``excinfo`` objects: :class:`ExceptionInfo`.

    .. note::
        Similar to caught exception objects in Python, explicitly clearing