Skip to content
Snippets Groups Projects
Verified Commit 9307d8fe authored by Daniel Hornung's avatar Daniel Hornung
Browse files

REFACTOR: Made validation_utils module private.

parent cff4af34
No related branches found
No related tags found
2 merge requests!138Release 0.14.0,!132Automatic XLSX export
...@@ -30,7 +30,7 @@ from typing import Union ...@@ -30,7 +30,7 @@ from typing import Union
import jsonschema import jsonschema
def _validate_jsonschema(instance: Union[dict, int, str, bool], def validate_jsonschema(instance: Union[dict, int, str, bool],
schema: Union[str, dict]): schema: Union[str, dict]):
""" """
A table_json_conversion compatible variant of jsonschema.validate(). A table_json_conversion compatible variant of jsonschema.validate().
......
...@@ -36,7 +36,7 @@ import jsonschema ...@@ -36,7 +36,7 @@ import jsonschema
from openpyxl import load_workbook from openpyxl import load_workbook
from openpyxl.worksheet.worksheet import Worksheet from openpyxl.worksheet.worksheet import Worksheet
from .validation_utils import _validate_jsonschema from ._validation_utils import validate_jsonschema
from caosadvancedtools.table_json_conversion import xlsx_utils from caosadvancedtools.table_json_conversion import xlsx_utils
from caosadvancedtools.table_json_conversion.fill_xlsx import read_or_dict from caosadvancedtools.table_json_conversion.fill_xlsx import read_or_dict
...@@ -329,7 +329,7 @@ class XLSXConverter: ...@@ -329,7 +329,7 @@ class XLSXConverter:
for e in exceptions]) for e in exceptions])
raise jsonschema.ValidationError(mess) raise jsonschema.ValidationError(mess)
if validate: if validate:
_validate_jsonschema(self._result, self._schema) validate_jsonschema(self._result, self._schema)
if self._errors: if self._errors:
raise RuntimeError("There were error while handling the XLSX file.") raise RuntimeError("There were error while handling the XLSX file.")
return self._result return self._result
...@@ -564,7 +564,7 @@ class XLSXConverter: ...@@ -564,7 +564,7 @@ class XLSXConverter:
value = False value = False
if value == 1 or isinstance(value, str) and '=true()' == value.lower(): if value == 1 or isinstance(value, str) and '=true()' == value.lower():
value = True value = True
_validate_jsonschema(value, subschema) validate_jsonschema(value, subschema)
# Finally: convert to target type # Finally: convert to target type
return self.PARSER[subschema.get("type", "string")](value) return self.PARSER[subschema.get("type", "string")](value)
......
...@@ -33,7 +33,7 @@ from jsonschema.exceptions import ValidationError ...@@ -33,7 +33,7 @@ from jsonschema.exceptions import ValidationError
from openpyxl import load_workbook, Workbook from openpyxl import load_workbook, Workbook
from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
from .validation_utils import _validate_jsonschema from ._validation_utils import validate_jsonschema
from .xlsx_utils import ( from .xlsx_utils import (
array_schema_from_model_schema, array_schema_from_model_schema,
get_foreign_key_columns, get_foreign_key_columns,
...@@ -360,7 +360,7 @@ validation_schema: dict, optional ...@@ -360,7 +360,7 @@ validation_schema: dict, optional
if list(validation_schema['properties'].values())[0]["type"] != "array": if list(validation_schema['properties'].values())[0]["type"] != "array":
validation_schema = array_schema_from_model_schema(read_or_dict(validation_schema)) validation_schema = array_schema_from_model_schema(read_or_dict(validation_schema))
try: try:
_validate_jsonschema(data, validation_schema) validate_jsonschema(data, validation_schema)
except ValidationError as verr: except ValidationError as verr:
print(verr.message) print(verr.message)
raise verr raise verr
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment