use importlib for all reading

moj-analytical-services · Dec 16, 2024 · 3784b5c · 3784b5c
1 parent e041c9c
commit 3784b5c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 83 deletions.
diff --git a/iam_builder/iam_schema.py b/iam_builder/iam_schema.py
@@ -1,24 +1,14 @@
 import jsonschema
 import json
 from iam_builder.exceptions import IAMValidationError
+import importlib_resources
 
-try:
-    import pkg_resources
-except Exception as e:
-    print("Error importing pkg_resources", e)
-    import importlib
 
-
-try:
+ref = importlib_resources.files(__name__).joinpath("schemas/iam_schema.json")
+with ref.open('rb') as fp:
     IAM_SCHEMA = json.load(
-        pkg_resources.resource_stream(__name__, "schemas/iam_schema.json")
+        fp
     )
-except ImportError:
-    ref = importlib_resources.files(__name__).joinpath("schemas/iam_schema.json")
-    with ref.open('rb') as fp:
-        IAM_SCHEMA = json.load(
-            fp.read()
-        )
 
 
 def validate_iam(config: dict):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,11 +7,11 @@ license = "MIT"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.9"
 PyYAML = "^6.0"
 parameterized = "0.7.*"
 jsonschema = "^4.10.0"
-importlib = "^1.0.4"
+importlib-resources = "^6.4.5"
 
 [tool.poetry.scripts]
 iam_builder = "iam_builder.command_line:main"