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

Removed jsonschema version check #1540

Merged
merged 3 commits into from
May 17, 2022
Merged

Removed jsonschema version check #1540

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da5ab88
Removed jsonschema version check
jonasboecquaert May 17, 2022
073cf44
Remove dependency on importlib-metadata
jonasboecquaert May 17, 2022
49ce1e8
Remove packaging dependency
jonasboecquaert May 17, 2022
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
28 changes: 7 additions & 21 deletions connexion/decorators/validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@
import logging
from typing import AnyStr, Union

try:
from importlib.metadata import version
except ImportError:
from importlib_metadata import version

from jsonschema import Draft4Validator, ValidationError, draft4_format_checker
from jsonschema.validators import extend
from packaging.version import Version
from werkzeug.datastructures import FileStorage

from ..exceptions import (BadRequestProblem, ExtraParameterProblem,
Expand All @@ -25,8 +19,6 @@
from ..lifecycle import ConnexionResponse
from ..utils import all_json, boolean, is_json_mimetype, is_null, is_nullable

_jsonschema_3_or_newer = Version(version("jsonschema")) >= Version("3.0.0")

logger = logging.getLogger('connexion.decorators.validation')

TYPE_MAP = {
Expand Down Expand Up @@ -280,19 +272,13 @@ def validate_parameter(parameter_type, value, param, param_name=None):
del param['required']
try:
if parameter_type == 'formdata' and param.get('type') == 'file':
if _jsonschema_3_or_newer:
extend(
Draft4Validator,
type_checker=Draft4Validator.TYPE_CHECKER.redefine(
"file",
lambda checker, instance: isinstance(instance, FileStorage)
)
)(param, format_checker=draft4_format_checker).validate(converted_value)
else:
Draft4Validator(
param,
format_checker=draft4_format_checker,
types={'file': FileStorage}).validate(converted_value)
extend(
Draft4Validator,
type_checker=Draft4Validator.TYPE_CHECKER.redefine(
"file",
lambda checker, instance: isinstance(instance, FileStorage)
)
)(param, format_checker=draft4_format_checker).validate(converted_value)
else:
Draft4Validator(
param, format_checker=draft4_format_checker).validate(converted_value)
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ def read_version(package):
'requests>=2.27,<3',
'inflection>=0.3.1,<0.6',
'werkzeug>=2,<3',
'importlib-metadata>=1 ; python_version<"3.8"',
'packaging>=20',
RobbeSneyders marked this conversation as resolved.
Show resolved Hide resolved
'starlette>=0.15,<1',
'httpx>=0.15,<1',
Expand Down