Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "ImportError" for jsonschema #479

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Fix "ImportError" for jsonschema #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ocpp/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from typing import Callable, Dict, Union

from jsonschema import Draft4Validator
from jsonschema import _validators as SchemaValidators
from jsonschema.exceptions import ValidationError as SchemaValidationError

from ocpp.exceptions import (
Expand Down Expand Up @@ -226,16 +225,17 @@ def validate_payload(message: Union[Call, CallResult], ocpp_version: str) -> Non
try:
validator.validate(message.payload)
except SchemaValidationError as e:
if e.validator == SchemaValidators.type.__name__:
if e.validator == "type":
raise TypeConstraintViolationError(
details={"cause": e.message, "ocpp_message": message}
)
elif e.validator == SchemaValidators.additionalProperties.__name__:
elif e.validator == "additionalProperties":
raise FormatViolationError(
details={"cause": e.message, "ocpp_message": message}
)
elif e.validator == SchemaValidators.required.__name__:
elif e.validator == "required":
raise ProtocolError(details={"cause": e.message})

elif e.validator == "maxLength":
raise TypeConstraintViolationError(
details={"cause": e.message, "ocpp_message": message}
Expand Down
Loading