From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Tue, 8 Oct 2024 20:33:10 +0000 (+0200)
Subject: python: utils: 'typing.Pattern' compatibility fix
X-Git-Tag: v6.0.9~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-develop-ci-m-6n00ea%2Fdeployments%2F5302;p=thirdparty%2Fknot-resolver.git

python: utils: 'typing.Pattern' compatibility fix
---

diff --git a/python/knot_resolver/datamodel/types/base_types.py b/python/knot_resolver/datamodel/types/base_types.py
index 038511482..90210b5a0 100644
--- a/python/knot_resolver/datamodel/types/base_types.py
+++ b/python/knot_resolver/datamodel/types/base_types.py
@@ -1,8 +1,7 @@
 import re
 from typing import Any, Dict, Type
 
-from typing_extensions import Pattern
-
+from knot_resolver.utils.compat.typing import Pattern
 from knot_resolver.utils.modeling import BaseValueType
 
 
diff --git a/python/knot_resolver/utils/compat/__init__.py b/python/knot_resolver/utils/compat/__init__.py
index 53993f6ce..52ffaa9cb 100644
--- a/python/knot_resolver/utils/compat/__init__.py
+++ b/python/knot_resolver/utils/compat/__init__.py
@@ -1,3 +1,3 @@
-from . import asyncio
+from . import asyncio, typing
 
-__all__ = ["asyncio"]
+__all__ = ["asyncio", "typing"]
diff --git a/python/knot_resolver/utils/compat/typing.py b/python/knot_resolver/utils/compat/typing.py
new file mode 100644
index 000000000..15654d345
--- /dev/null
+++ b/python/knot_resolver/utils/compat/typing.py
@@ -0,0 +1,8 @@
+# The 'typing.Pattern' is deprecated since python 3.8 and is removed in version 3.12.
+# https://docs.python.org/3.9/library/typing.html#typing.Pattern
+try:
+    from typing import Pattern
+except ImportError:
+    from re import Pattern
+
+__all__ = ["Pattern"]