|
17 | 17 | from marshmallow import RAISE, fields |
18 | 18 | from marshmallow.exceptions import ValidationError |
19 | 19 | from marshmallow.fields import Field, Nested |
20 | | -from marshmallow.utils import FieldInstanceResolutionError, from_iso_datetime, resolve_field_instance |
| 20 | +from marshmallow.utils import from_iso_datetime, resolve_field_instance |
21 | 21 |
|
22 | 22 | from ..._utils._arm_id_utils import AMLVersionedArmId, is_ARM_id_for_resource, parse_name_label, parse_name_version |
23 | 23 | from ..._utils._experimental import _is_warning_cached |
@@ -439,7 +439,7 @@ def __init__(self, union_fields: List[fields.Field], is_strict=False, **kwargs): |
439 | 439 | self._union_fields = [resolve_field_instance(cls_or_instance) for cls_or_instance in union_fields] |
440 | 440 | # TODO: make serialization/de-serialization work in the same way as json schema when is_strict is True |
441 | 441 | self.is_strict = is_strict # S\When True, combine fields with oneOf instead of anyOf at schema generation |
442 | | - except FieldInstanceResolutionError as error: |
| 442 | + except ValueError as error: |
443 | 443 | raise ValueError( |
444 | 444 | 'Elements of "union_fields" must be subclasses or instances of marshmallow.base.FieldABC.' |
445 | 445 | ) from error |
@@ -876,7 +876,7 @@ def __init__(self, experimental_field: fields.Field, **kwargs): |
876 | 876 | try: |
877 | 877 | self._experimental_field = resolve_field_instance(experimental_field) |
878 | 878 | self.required = experimental_field.required |
879 | | - except FieldInstanceResolutionError as error: |
| 879 | + except ValueError as error: |
880 | 880 | raise ValueError( |
881 | 881 | '"experimental_field" must be subclasses or instances of marshmallow.base.FieldABC.' |
882 | 882 | ) from error |
|
0 commit comments