[typing] Use the re namespace in 're' typing everywhere

Author: Pierre-Sassoulas

src/_pytest/_code/code.py

@@ -14,7 +14,6 @@
 import os
 from pathlib import Path
 import re
-from re import Pattern
 import sys
 import traceback
 from traceback import format_exception_only
@@ -705,7 +704,7 @@ def _stringify_exception(self, exc: BaseException) -> str:
             ]
         )
 
-    def match(self, regexp: str | Pattern[str]) -> Literal[True]:
+    def match(self, regexp: str | re.Pattern[str]) -> Literal[True]:
         """Check whether the regular expression `regexp` matches the string
         representation of the exception using :func:`python:re.search`.
 
@@ -724,7 +723,7 @@ def _group_contains(
         self,
         exc_group: BaseExceptionGroup[BaseException],
         expected_exception: EXCEPTION_OR_MORE,
-        match: str | Pattern[str] | None,
+        match: str | re.Pattern[str] | None,
         target_depth: int | None = None,
         current_depth: int = 1,
     ) -> bool:
@@ -754,7 +753,7 @@ def group_contains(
         self,
         expected_exception: EXCEPTION_OR_MORE,
         *,
-        match: str | Pattern[str] | None = None,
+        match: str | re.Pattern[str] | None = None,
         depth: int | None = None,
     ) -> bool:
         """Check whether a captured exception group contains a matching exception.
@@ -763,7 +762,7 @@ def group_contains(
             The expected exception type, or a tuple if one of multiple possible
             exception types are expected.
 
-        :param str | Pattern[str] | None match:
+        :param str | re.Pattern[str] | None match:
             If specified, a string containing a regular expression,
             or a regular expression object, that is tested against the string
             representation of the exception and its `PEP-678 <https://peps.python.org/pep-0678/>` `__notes__`

src/_pytest/doctest.py

@@ -14,7 +14,7 @@
 import os
 from pathlib import Path
 import platform
-from re import Pattern
+import re
 import sys
 import traceback
 import types
@@ -593,7 +593,6 @@ def _from_module(self, module, object):
 
 def _init_checker_class() -> type[doctest.OutputChecker]:
     import doctest
-    import re
 
     class LiteralsOutputChecker(doctest.OutputChecker):
         # Based on doctest_nose_plugin.py from the nltk project
@@ -636,7 +635,7 @@ def check_output(self, want: str, got: str, optionflags: int) -> bool:
             if not allow_unicode and not allow_bytes and not allow_number:
                 return False
 
-            def remove_prefixes(regex: Pattern[str], txt: str) -> str:
+            def remove_prefixes(regex: re.Pattern[str], txt: str) -> str:
                 return re.sub(regex, r"\1\2", txt)
 
             if allow_unicode:

src/_pytest/junitxml.py

@@ -17,7 +17,6 @@
 import os
 import platform
 import re
-from re import Match
 import xml.etree.ElementTree as ET
 
 from _pytest import nodes
@@ -48,7 +47,7 @@ def bin_xml_escape(arg: object) -> str:
     The idea is to escape visually for the user rather than for XML itself.
     """
 
-    def repl(matchobj: Match[str]) -> str:
+    def repl(matchobj: re.Match[str]) -> str:
         i = ord(matchobj.group())
         if i <= 0xFF:
             return f"#x{i:02X}"

src/_pytest/python.py

@@ -20,7 +20,7 @@
 import itertools
 import os
 from pathlib import Path
-from re import Pattern
+import re
 import types
 from typing import Any
 from typing import final
@@ -973,7 +973,7 @@ def _idval_from_value(self, val: object) -> str | None:
             return _ascii_escaped_by_config(val, self.config)
         elif val is None or isinstance(val, (float, int, bool, complex)):
             return str(val)
-        elif isinstance(val, Pattern):
+        elif isinstance(val, re.Pattern):
             return ascii_escaped(val.pattern)
         elif val is NOTSET:
             # Fallback to default. Note that NOTSET is an enum.Enum.

src/_pytest/python_api.py

@@ -12,7 +12,6 @@
 from numbers import Complex
 import pprint
 import re
-from re import Pattern
 from types import TracebackType
 from typing import Any
 from typing import cast
@@ -780,7 +779,7 @@ def _as_numpy_array(obj: object) -> ndarray | None:
 def raises(
     expected_exception: type[E] | tuple[type[E], ...],
     *,
-    match: str | Pattern[str] | None = ...,
+    match: str | re.Pattern[str] | None = ...,
 ) -> RaisesContext[E]: ...
 
 
@@ -955,7 +954,7 @@ def raises(
     message = f"DID NOT RAISE {expected_exception}"
 
     if not args:
-        match: str | Pattern[str] | None = kwargs.pop("match", None)
+        match: str | re.Pattern[str] | None = kwargs.pop("match", None)
         if kwargs:
             msg = "Unexpected keyword arguments passed to pytest.raises: "
             msg += ", ".join(sorted(kwargs))
@@ -983,7 +982,7 @@ def __init__(
         self,
         expected_exception: type[E] | tuple[type[E], ...],
         message: str,
-        match_expr: str | Pattern[str] | None = None,
+        match_expr: str | re.Pattern[str] | None = None,
     ) -> None:
         self.expected_exception = expected_exception
         self.message = message

src/_pytest/recwarn.py

@@ -8,7 +8,6 @@
 from collections.abc import Iterator
 from pprint import pformat
 import re
-from re import Pattern
 from types import TracebackType
 from typing import Any
 from typing import final
@@ -44,7 +43,9 @@ def recwarn() -> Generator[WarningsRecorder]:
 
 
 @overload
-def deprecated_call(*, match: str | Pattern[str] | None = ...) -> WarningsRecorder: ...
+def deprecated_call(
+    *, match: str | re.Pattern[str] | None = ...
+) -> WarningsRecorder: ...
 
 
 @overload
@@ -89,7 +90,7 @@ def deprecated_call(
 def warns(
     expected_warning: type[Warning] | tuple[type[Warning], ...] = ...,
     *,
-    match: str | Pattern[str] | None = ...,
+    match: str | re.Pattern[str] | None = ...,
 ) -> WarningsChecker: ...
 
 
@@ -105,7 +106,7 @@ def warns(
 def warns(
     expected_warning: type[Warning] | tuple[type[Warning], ...] = Warning,
     *args: Any,
-    match: str | Pattern[str] | None = None,
+    match: str | re.Pattern[str] | None = None,
     **kwargs: Any,
 ) -> WarningsChecker | Any:
     r"""Assert that code raises a particular class of warning.
@@ -258,7 +259,7 @@ class WarningsChecker(WarningsRecorder):
     def __init__(
         self,
         expected_warning: type[Warning] | tuple[type[Warning], ...] = Warning,
-        match_expr: str | Pattern[str] | None = None,
+        match_expr: str | re.Pattern[str] | None = None,
         *,
         _ispytest: bool = False,
     ) -> None: