OutcomeExceptions: remove '__module__ = "builtins"' hack (#19)

Ref: #6027

Author: blueyed

doc/en/warnings.rst

@@ -276,7 +276,7 @@ argument ``match`` to assert that the exception matches a text or regex::
     ...     warnings.warn("this is not here", UserWarning)
     Traceback (most recent call last):
       ...
-    Failed: DID NOT WARN. No warnings of type ...UserWarning... was emitted...
+    _pytest.outcomes.Failed: DID NOT WARN. No warnings of type ...UserWarning... was emitted...
 
 You can also call ``pytest.warns`` on a function or code string:
 

src/_pytest/_code/code.py

@@ -27,6 +27,7 @@
 import _pytest
 from _pytest._io.saferepr import safeformat
 from _pytest._io.saferepr import saferepr
+from _pytest.outcomes import OutcomeException
 
 if False:  # TYPE_CHECKING
     from typing import Type
@@ -521,6 +522,10 @@ def exconly(self, tryshort: bool = False) -> str:
             removed from the beginning)
         """
         lines = format_exception_only(self.type, self.value)
+        if isinstance(self.value, OutcomeException):
+            # Remove module prefix.
+            assert lines[0].startswith(self.type.__module__), (lines[0], self.type)
+            lines[0] = lines[0][len(self.type.__module__) + 1 :]
         text = "".join(lines)
         text = text.rstrip()
         if tryshort:

src/_pytest/outcomes.py

@@ -40,10 +40,6 @@ def __repr__(self) -> str:
 
 
 class Skipped(OutcomeException):
-    # XXX hackish: on 3k we fake to live in the builtins
-    # in order to have Skipped exception printing shorter/nicer
-    __module__ = "builtins"
-
     def __init__(
         self,
         msg: Optional[str] = None,
@@ -57,8 +53,6 @@ def __init__(
 class Failed(OutcomeException):
     """ raised from an explicit call to pytest.fail() """
 
-    __module__ = "builtins"
-
 
 class Exit(Exception):
     """ raised for immediate program exits (no tracebacks/summaries)"""

src/_pytest/recwarn.py

@@ -108,8 +108,7 @@ def warns(  # noqa: F811
         ...     warnings.warn("this is not here", UserWarning)
         Traceback (most recent call last):
           ...
-        Failed: DID NOT WARN. No warnings of type ...UserWarning... was emitted...
-
+        _pytest.outcomes.Failed: DID NOT WARN. No warnings of type ...UserWarning... was emitted...
     """
     __tracebackhide__ = True
     if not args: