Improvement: extend pytest.raises to support Exception having __repr__ method and initialized with kwargs

AUTHORS

@@ -56,6 +56,7 @@ Ben Gartner
 Ben Webb
 Benjamin Peterson
 Bernard Pratz
+Bo Wu
 Bob Ippolito
 Brian Dorsey
 Brian Larsen

src/_pytest/_code/code.py

@@ -708,7 +708,7 @@ def match(self, regexp: Union[str, Pattern[str]]) -> "Literal[True]":
         """
         __tracebackhide__ = True
         value = str(self.value)
-        msg = f"Regex pattern did not match.\n Regex: {regexp!r}\n Input: {value!r}"
+        msg = f"Regex pattern did not match.\n Regex: {regexp!r}\n str(exception): {value!r}"
         if regexp == value:
             msg += "\n Did you mean to `re.escape()` the regex?"
         assert re.search(regexp, value), msg

testing/code/test_excinfo.py

@@ -434,7 +434,7 @@ def test_division_zero():
     match = [
         r"E .* AssertionError: Regex pattern did not match.",
         r"E .* Regex: '\[123\]\+'",
-        r"E .* Input: 'division by zero'",
+        r"E .* str\(exception\): 'division by zero'",
     ]
     result.stdout.re_match_lines(match)
     result.stdout.no_fnmatch_line("*__tracebackhide__ = True*")

testing/python/raises.py

@@ -196,7 +196,7 @@ def test_raises_match(self) -> None:
         expr = (
             "Regex pattern did not match.\n"
             f" Regex: {msg!r}\n"
-            " Input: \"invalid literal for int() with base 10: 'asdf'\""
+            " str(exception): \"invalid literal for int() with base 10: 'asdf'\""
         )
         with pytest.raises(AssertionError, match="(?m)" + re.escape(expr)):
             with pytest.raises(ValueError, match=msg):
@@ -221,7 +221,10 @@ def test_match_failure_string_quoting(self):
             with pytest.raises(AssertionError, match="'foo"):
                 raise AssertionError("'bar")
         (msg,) = excinfo.value.args
-        assert msg == '''Regex pattern did not match.\n Regex: "'foo"\n Input: "'bar"'''
+        assert (
+            msg
+            == '''Regex pattern did not match.\n Regex: "'foo"\n str(exception): "'bar"'''
+        )
 
     def test_match_failure_exact_string_message(self):
         message = "Oh here is a message with (42) numbers in parameters"
@@ -232,7 +235,7 @@ def test_match_failure_exact_string_message(self):
         assert msg == (
             "Regex pattern did not match.\n"
             " Regex: 'Oh here is a message with (42) numbers in parameters'\n"
-            " Input: 'Oh here is a message with (42) numbers in parameters'\n"
+            " str(exception): 'Oh here is a message with (42) numbers in parameters'\n"
             " Did you mean to `re.escape()` the regex?"
         )