Merge pull request #828 from amoralej/master

Use importlib.resources in python >= 3.7

Author: c00kiemon5ter

setup.cfg

@@ -53,7 +53,7 @@ install_requires =
     pytz
     requests >= 1.0.0
     six
-    importlib_resources
+    importlib_resources;python_version<'3.7'
     xmlschema >= 1.2.1
 
 

src/saml2/sigver.py

@@ -9,12 +9,12 @@
 import os
 import re
 import six
+import sys
 from uuid import uuid4 as gen_random_key
 from time import mktime
 from tempfile import NamedTemporaryFile
 from subprocess import Popen
 from subprocess import PIPE
-from importlib_resources import path as _resource_path
 
 from OpenSSL import crypto
 
@@ -59,6 +59,11 @@
 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__)
 

src/saml2/xml/schema/__init__.py

@@ -1,10 +1,15 @@
-from importlib_resources import path as _resource_path
+import sys
 
 from xmlschema import XMLSchema as _XMLSchema
 from xmlschema.exceptions import XMLSchemaException as XMLSchemaError
 
 import saml2.data.schemas as _data_schemas
 
+# 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
 
 def _create_xml_schema_validator(source, **kwargs):
     kwargs = {