Fix #66: Replace pkg_resources with importlib_resources. (#68)

zamzterz · Dec 10, 2019 · bad554b · bad554b
1 parent a85d2b1
commit bad554b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -16,9 +16,10 @@
     install_requires=[
         'oic==1.1.2',
         'Flask',
-        'requests'
+        'requests',
+        'importlib_resources'
     ],
-    package_data={'flask_pyoidc': ['files/parse_fragment.html']},
+    package_data={'flask_pyoidc': ['parse_fragment.html']},
     long_description=long_description,
     long_description_content_type='text/markdown',
 )
diff --git a/src/flask_pyoidc/flask_pyoidc.py b/src/flask_pyoidc/flask_pyoidc.py
@@ -18,7 +18,7 @@
 import logging
 
 import flask
-import pkg_resources
+import importlib_resources
 from flask import current_app
 from flask.helpers import url_for
 from oic import rndstr
@@ -125,7 +125,7 @@ def _handle_authentication_response(self):
             return 'Something went wrong.'
 
         if flask.session.pop('fragment_encoded_response', False):
-            return pkg_resources.resource_string(__name__, 'files/parse_fragment.html').decode('utf-8')
+            return importlib_resources.read_binary('flask_pyoidc', 'parse_fragment.html').decode('utf-8')
 
         is_processing_fragment_encoded_response = flask.request.method == 'POST'
 

diff --git a/src/flask_pyoidc/files/parse_fragment.html → src/flask_pyoidc/parse_fragment.html b/src/flask_pyoidc/files/parse_fragment.html → src/flask_pyoidc/parse_fragment.html