diff options
author | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2021-10-19 13:11:57 +0300 |
---|---|---|
committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2021-10-19 13:33:53 +0300 |
commit | 5583f16c161f10f6ef39818657fec4d4eca5ff2e (patch) | |
tree | a3e176caf8ee989565cbf2fe93121a62b5d719c3 /src/saml2/sigver.py | |
parent | 8e44c77c68837f8237e52cbd34faefef5cd5d3b3 (diff) | |
download | pysaml2-5583f16c161f10f6ef39818657fec4d4eca5ff2e.tar.gz |
Use the files API instead of path from importlib.resources
Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
Diffstat (limited to 'src/saml2/sigver.py')
-rw-r--r-- | src/saml2/sigver.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py index 6d1d0f40..aa0944b7 100644 --- a/src/saml2/sigver.py +++ b/src/saml2/sigver.py @@ -16,6 +16,13 @@ from tempfile import NamedTemporaryFile from subprocess import Popen from subprocess import PIPE +# 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 OpenSSL import crypto import pytz @@ -56,11 +63,6 @@ from saml2.xmlenc import EncryptedData from saml2.xml.schema import node_to_schema from saml2.xml.schema import XMLSchemaError -# importlib.resources was introduced in python 3.7 -if sys.version_info[:2] >= (3, 7): - from importlib.resources import path as _resource_path -else: - from importlib_resources import path as _resource_path logger = logging.getLogger(__name__) @@ -1306,8 +1308,8 @@ class SecurityContext(object): self.only_use_keys_in_metadata = only_use_keys_in_metadata if not template: - with _resource_path(_data_template, "template_enc.xml") as fp: - self.template = str(fp) + fp = str(_resource_files(_data_template).joinpath("template_enc.xml")) + self.template = str(fp) else: self.template = template |