From 1f938e3ef5a3f1dfcc8e5a74510755f46aacc90e Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Fri, 1 Oct 2021 13:56:06 +0300
Subject: [PATCH] compat: replace REGEX_TYPE with typing.Pattern

Since Python 3.7, there is `re.Pattern` for this, but since we need to
support Python 3.6, can use `typing.Pattern` which works as well.
---
 src/_pytest/compat.py | 5 -----
 src/_pytest/python.py | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py
index 0c7e76268..1cf3ded01 100644
--- a/src/_pytest/compat.py
+++ b/src/_pytest/compat.py
@@ -3,7 +3,6 @@ import enum
 import functools
 import inspect
 import os
-import re
 import sys
 from contextlib import contextmanager
 from inspect import Parameter
@@ -64,10 +63,6 @@ def _format_args(func: Callable[..., Any]) -> str:
     return str(signature(func))
 
 
-# The type of re.compile objects is not exposed in Python.
-REGEX_TYPE = type(re.compile(""))
-
-
 def is_generator(func: object) -> bool:
     genfunc = inspect.isgeneratorfunction(func)
     return genfunc and not iscoroutinefunction(func)
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
index e44320ddf..336c58627 100644
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -20,6 +20,7 @@ from typing import Iterator
 from typing import List
 from typing import Mapping
 from typing import Optional
+from typing import Pattern
 from typing import Sequence
 from typing import Set
 from typing import Tuple
@@ -46,7 +47,6 @@ from _pytest.compat import is_generator
 from _pytest.compat import LEGACY_PATH
 from _pytest.compat import legacy_path
 from _pytest.compat import NOTSET
-from _pytest.compat import REGEX_TYPE
 from _pytest.compat import safe_getattr
 from _pytest.compat import safe_isclass
 from _pytest.compat import STRING_TYPES
@@ -1332,7 +1332,7 @@ def _idval(
         return _ascii_escaped_by_config(val, config)
     elif val is None or isinstance(val, (float, int, bool, complex)):
         return str(val)
-    elif isinstance(val, REGEX_TYPE):
+    elif isinstance(val, Pattern):
         return ascii_escaped(val.pattern)
     elif val is NOTSET:
         # Fallback to default. Note that NOTSET is an enum.Enum.