File tree Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change 22from typing import Dict
33from typing import Hashable
44from typing import Mapping
5+ from typing import Optional
56from typing import Type
67from typing import TypeVar
78
8- from jsonschema .protocols import Validator
99from jsonschema_spec import Spec as JsonschemaSpec
1010from jsonschema_spec import default_handlers
11- from openapi_spec_validator import openapi_v30_spec_validator
11+ from openapi_spec_validator .validation import openapi_spec_validator_proxy
12+ from openapi_spec_validator .validation .protocols import SupportsValidation
1213
1314TSpec = TypeVar ("TSpec" , bound = "Spec" )
1415
@@ -24,7 +25,7 @@ def create(
2425 url : str = "" ,
2526 ref_resolver_handlers : Dict [str , Any ] = default_handlers ,
2627 separator : str = SPEC_SEPARATOR ,
27- validator : Validator = openapi_v30_spec_validator ,
28+ validator : Optional [ SupportsValidation ] = openapi_spec_validator_proxy ,
2829 ) -> TSpec :
2930 if validator is not None :
3031 validator .validate (data , spec_url = url )
Original file line number Diff line number Diff line change 33from typing import Dict
44from typing import Hashable
55from typing import Mapping
6+ from typing import Optional
67
78from jsonschema_spec import default_handlers
8- from openapi_spec_validator import openapi_v30_spec_validator
9+ from openapi_spec_validator .validation import openapi_spec_validator_proxy
10+ from openapi_spec_validator .validation .protocols import SupportsValidation
911
1012from openapi_core .spec .paths import Spec
1113
@@ -16,9 +18,9 @@ def create_spec(
1618 handlers : Dict [str , Any ] = default_handlers ,
1719 validate_spec : bool = True ,
1820) -> Spec :
19- validator = None
21+ validator : Optional [ SupportsValidation ] = None
2022 if validate_spec :
21- validator = openapi_v30_spec_validator
23+ validator = openapi_spec_validator_proxy
2224
2325 return Spec .create (
2426 spec_dict ,
Original file line number Diff line number Diff line change 11import pytest
2- from jsonschema . exceptions import ValidationError
2+ from openapi_spec_validator . validation . exceptions import ValidatorDetectError
33
44from openapi_core .spec import Spec
55
66
77class TestEmpty :
88 def test_raises_on_invalid (self ):
9- with pytest .raises (ValidationError ):
9+ with pytest .raises (ValidatorDetectError ):
1010 Spec .create ("" )
You can’t perform that action at this time.
0 commit comments