From c5828f2a0d0d23f06346593cfe12a72608b074ff Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Tue, 8 Apr 2025 09:32:09 +0200
Subject: [PATCH 1/3] Remove old dependencies

---
 pyproject.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 985692043..a9a34c1c9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,8 +39,6 @@ parse_xsd2 = "saml2.tools.parse_xsd2:main"
 python = "^3.9"
 cryptography = ">=3.1"
 defusedxml = "*"
-importlib-metadata = {version = ">=1.7.0", python = "<3.8"}
-importlib-resources = {python = "<3.9", version = "*"}
 paste = {optional = true, version = "*"}
 pyopenssl = "<24.3.0"
 python-dateutil = "*"

From a51043591a86f2643efc05d5df88b1ae337ef6d7 Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Tue, 8 Apr 2025 09:38:46 +0200
Subject: [PATCH 2/3] remove importlib_resources imports

---
 src/saml2/sigver.py              | 16 +++-------------
 src/saml2/xml/schema/__init__.py | 10 +---------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
index f3af1ec99..ddb5f9221 100644
--- a/src/saml2/sigver.py
+++ b/src/saml2/sigver.py
@@ -4,6 +4,7 @@
 
 import base64
 import datetime
+from importlib.resources import files as _resource_files
 import hashlib
 import itertools
 import logging
@@ -11,24 +12,13 @@
 import re
 from subprocess import PIPE
 from subprocess import Popen
-import sys
 from tempfile import NamedTemporaryFile
 from time import mktime
-from uuid import uuid4 as gen_random_key
-
-import dateutil
-
-
-# importlib.resources was introduced in python 3.7
-# files API from importlib.resources introduced in python 3.9
-if sys.version_info[:2] >= (3, 9):
-    from importlib.resources import files as _resource_files
-else:
-    from importlib_resources import files as _resource_files
-
 from urllib import parse
+from uuid import uuid4 as gen_random_key
 
 from OpenSSL import crypto
+import dateutil
 import pytz
 
 from saml2 import ExtensionElement
diff --git a/src/saml2/xml/schema/__init__.py b/src/saml2/xml/schema/__init__.py
index 08e56ce63..e003dfc09 100644
--- a/src/saml2/xml/schema/__init__.py
+++ b/src/saml2/xml/schema/__init__.py
@@ -1,12 +1,4 @@
-import sys
-
-
-# importlib.resources was introduced in python 3.7
-# files API from importlib.resources introduced in python 3.9
-if sys.version_info[:2] >= (3, 9):
-    from importlib.resources import files as _resource_files
-else:
-    from importlib_resources import files as _resource_files
+from importlib.resources import files as _resource_files
 
 from xmlschema import XMLSchema as _XMLSchema
 from xmlschema.exceptions import XMLSchemaException as _XMLSchemaException

From 900f2cf253058859d87fac0cc5ff301e4e87e2a5 Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Tue, 8 Apr 2025 09:39:48 +0200
Subject: [PATCH 3/3] remove importlib_metadata import

---
 src/saml2/version.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/saml2/version.py b/src/saml2/version.py
index 281fab9fc..8ef1c21e5 100644
--- a/src/saml2/version.py
+++ b/src/saml2/version.py
@@ -1,7 +1,4 @@
-try:
-    from importlib.metadata import version as _resolve_package_version
-except ImportError:
-    from importlib_metadata import version as _resolve_package_version  # type: ignore[no-redef]
+from importlib.metadata import version as _resolve_package_version
 
 
 def _parse_version():