Merge remote-tracking branch 'upstream/master' into mm

2019-08-26 20:00:30 -03:00
parent c2f762460f 0215bcd84e
commit c28e428249
70 changed files with 507 additions and 286 deletions
--- a/src/_pytest/_code/code.py
+++ b/src/_pytest/_code/code.py
@@ -596,7 +596,7 @@ class ExceptionInfo(Generic[_E]):
        )
        return fmt.repr_excinfo(self)

-    def match(self, regexp: Union[str, Pattern]) -> bool:
+    def match(self, regexp: "Union[str, Pattern]") -> bool:
        """
        Check whether the regular expression 'regexp' is found in the string
        representation of the exception using ``re.search``. If it matches