From a4039e27c11a740eede92f1912e366d7aad1e95f Mon Sep 17 00:00:00 2001
From: Simon Wittl <simon.wittl@th-deg.de>
Date: Thu, 12 Dec 2024 08:02:29 +0100
Subject: [PATCH] py38 compa
---
src/thd_json/detector/__init__.py | 1 +
src/thd_json/header/__init__.py | 1 +
src/thd_json/image/__init__.py | 1 +
src/thd_json/projection/__init__.py | 1 +
src/thd_json/projection_geometry/__init__.py | 1 +
src/thd_json/projection_matrix/__init__.py | 1 +
src/thd_json/roi/__init__.py | 1 +
src/thd_json/source/__init__.py | 1 +
src/thd_json/validation.py | 32 +++++++++-----------
src/thd_json/volume/__init__.py | 1 +
10 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/thd_json/detector/__init__.py b/src/thd_json/detector/__init__.py
index 1f382c2..1915e93 100644
--- a/src/thd_json/detector/__init__.py
+++ b/src/thd_json/detector/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
diff --git a/src/thd_json/header/__init__.py b/src/thd_json/header/__init__.py
index 4af07ce..5cae0b3 100644
--- a/src/thd_json/header/__init__.py
+++ b/src/thd_json/header/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
diff --git a/src/thd_json/image/__init__.py b/src/thd_json/image/__init__.py
index 4dd5cb3..bf06534 100644
--- a/src/thd_json/image/__init__.py
+++ b/src/thd_json/image/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
diff --git a/src/thd_json/projection/__init__.py b/src/thd_json/projection/__init__.py
index 0c4b663..8328bdd 100644
--- a/src/thd_json/projection/__init__.py
+++ b/src/thd_json/projection/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from thd_json.header import JsonHeader, generate_header
from thd_json.projection_geometry import get_projection_geometry_dict
diff --git a/src/thd_json/projection_geometry/__init__.py b/src/thd_json/projection_geometry/__init__.py
index de1571f..4e8b021 100644
--- a/src/thd_json/projection_geometry/__init__.py
+++ b/src/thd_json/projection_geometry/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
diff --git a/src/thd_json/projection_matrix/__init__.py b/src/thd_json/projection_matrix/__init__.py
index e69de29..6c43ea2 100644
--- a/src/thd_json/projection_matrix/__init__.py
+++ b/src/thd_json/projection_matrix/__init__.py
@@ -0,0 +1 @@
+from __future__ import annotations
\ No newline at end of file
diff --git a/src/thd_json/roi/__init__.py b/src/thd_json/roi/__init__.py
index 06c7534..ff4cd7b 100644
--- a/src/thd_json/roi/__init__.py
+++ b/src/thd_json/roi/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
diff --git a/src/thd_json/source/__init__.py b/src/thd_json/source/__init__.py
index 62e56f5..afc1b5d 100644
--- a/src/thd_json/source/__init__.py
+++ b/src/thd_json/source/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
diff --git a/src/thd_json/validation.py b/src/thd_json/validation.py
index 50859cc..795ce1d 100644
--- a/src/thd_json/validation.py
+++ b/src/thd_json/validation.py
@@ -11,25 +11,23 @@ class Validator:
print(f"Validator for schema: {json_schema} \nSuffix: {json_suffix}\n")
def file(self, file_path: Path) -> bool:
- with (
- open(str(self.json_schema)) as schema_file,
- open(str(file_path)) as data_file,
- ):
- schema = json.load(schema_file)
- data = json.load(data_file)
- schema_path = self.json_schema.parent.absolute().as_uri()
- resolver = RefResolver(base_uri=schema_path, referrer=schema)
+ with open(str(self.json_schema)) as schema_file:
+ with open(str(file_path)) as data_file:
+ schema = json.load(schema_file)
+ data = json.load(data_file)
+ schema_path = self.json_schema.parent.absolute().as_uri()
+ resolver = RefResolver(base_uri=schema_path, referrer=schema)
- try:
- Draft202012Validator(
- schema=schema,
- format_checker=Draft202012Validator.FORMAT_CHECKER,
- resolver=resolver,
- ).validate(data)
- print(f"Validate file: {file_path.parent} / {file_path.name}\n")
+ try:
+ Draft202012Validator(
+ schema=schema,
+ format_checker=Draft202012Validator.FORMAT_CHECKER,
+ resolver=resolver,
+ ).validate(data)
+ print(f"Validate file: {file_path.parent} / {file_path.name}\n")
- except ValidationError as e:
- print("Validation error:", e)
+ except ValidationError as e:
+ print("Validation error:", e)
return True
diff --git a/src/thd_json/volume/__init__.py b/src/thd_json/volume/__init__.py
index a7237a5..f7146a2 100644
--- a/src/thd_json/volume/__init__.py
+++ b/src/thd_json/volume/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
from thd_json import Validator
from pathlib import Path
--
GitLab