Skip to content

Commit 8f21aa7

Browse files
thervezippolyte
authored andcommitted
Move the enum error handling in model utils
1 parent bb30a1a commit 8f21aa7

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.generator/templates/model.mustache

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import re # noqa: F401
44
import sys # noqa: F401
55

66
from {{packageName}}.model_utils import ( # noqa: F401
7-
ApiValueError,
87
ApiTypeError,
98
ModelComposed,
109
ModelNormal,

.generator/templates/model_templates/method_init_simple.mustache

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@
5656
self._configuration = _configuration
5757
self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
5858
self._unparsed = False
59-
try:
60-
self.value = value
61-
except ApiValueError:
62-
self.__dict__['value'] = value
63-
self._unparsed = True
59+
self.value = value
6460
if kwargs:
6561
raise ApiTypeError(
6662
"Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % (

.generator/templates/model_templates/method_set_attribute.mustache

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@
3636
value, required_types_mixed, path_to_item, self._spec_property_naming,
3737
self._check_type, configuration=self._configuration)
3838
if (name,) in self.allowed_values:
39-
check_allowed_values(
40-
self.allowed_values,
41-
(name,),
42-
value
43-
)
39+
try:
40+
check_allowed_values(self.allowed_values, (name,), value)
41+
except ApiValueError:
42+
self.__dict__["_data_store"][name] = value
43+
self._unparsed = True
44+
return
4445
if (name,) in self.validations:
4546
check_validations(
4647
self.validations,

0 commit comments

Comments
 (0)