kennethreitz/pydantic
1
0
Fork 0
mirror of https://github.com/kennethreitz/pydantic.git synced 2026-06-05 23:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaner support for deep use of typing types

Browse Source
This commit is contained in:
Samuel Colvin
2017-05-09 15:40:01 +01:00
parent 30b54e70bd
commit 5cedb3e8e1
2 changed files with 20 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pydantic/fields.py
+12 -45
View File
@@ -96,7 +96,6 @@ class Field:
if origin is None:
return
self.multipart = True
if origin is Union:
types_ = []
for type_ in self.type_.__args__:
@@ -112,6 +111,7 @@ class Field:
allow_none=self.allow_none,
name=f'{self.name}_{type_display(t)}'
) for t in types_]
self.multipart = True
elif issubclass(origin, Sequence):
self.type_ = self.type_.__args__[0]
self.shape = Shape.SEQUENCE
@@ -129,49 +129,16 @@ class Field:
name=f'key_{self.name}'
)
self.sub_fields = self.sub_fields or [Field(
type_=self.type_,
class_validators=class_validators,
default=self.default,
required=self.required,
allow_none=self.allow_none,
name=f'_{self.name}'
)]
# if origin is not Union:
# if issubclass(origin, Sequence):
# self.type_ = self.type_.__args__[0]
# self.shape = Shape.SEQUENCE
# else:
# assert issubclass(origin, Mapping)
# self.key_type_ = self.type_.__args__[0]
# self.type_ = self.type_.__args__[1]
# self.shape = Shape.MAPPING
# self.key_field = Field(
# type_=self.key_type_,
# class_validators=class_validators,
# default=self.default,
# required=self.required,
# name=f'key_{self.name}'
# )
#
# origin = getattr(self.type_, '__origin__', None)
# if origin is Union:
# types_ = []
# for type_ in self.type_.__args__:
# if type_ is NoneType:
# self.allow_none = True
# else:
# types_.append(type_)
# self.multipart = True
# self.sub_fields = [Field(
# type_=t,
# class_validators=class_validators,
# default=self.default,
# required=self.required,
# allow_none=self.allow_none,
# name=f'{self.name}_{type_display(t)}'
# ) for t in types_]
if self.sub_fields is None and getattr(self.type_, '__origin__', None):
self.multipart = True
self.sub_fields = self.sub_fields or [Field(
type_=self.type_,
class_validators=class_validators,
default=self.default,
required=self.required,
allow_none=self.allow_none,
name=f'_{self.name}'
)]
def _populate_validators(self, class_validators):
get_validators = getattr(self.type_, 'get_validators', None)
@@ -281,7 +248,7 @@ def _get_validator_signature(validator):
# bind here will raise a TypeError so:
# 1. we can deal with it before validation begins
# 2. (more importantly) it doesn't get confused with a TypeError when evaluating the validator
# 2. (more importantly) it doesn't get confused with a TypeError when executing the validator
try:
if list(signature.parameters)[0] == 'self':
signature.bind(object(), 1)
tests/test_complex.py
+8 -2
View File
@@ -312,6 +312,12 @@ def test_list_unions():
def test_recursive_lists():
class Model(BaseModel):
v: List[List[Union[float, int]]] = ...
v: List[List[Union[int, float]]] = ...
assert Model(v=[[1, 2], [3, '4', 4.1]]).v == [[1, 2], [3, 4, 4.1]]
assert Model(v=[[1, 2], [3, '4', '4.1']]).v == [[1, 2], [3, 4, 4.1]]
assert Model.__fields__['v'].sub_fields[0].name == '_v'
assert len(Model.__fields__['v'].sub_fields) == 1
assert Model.__fields__['v'].sub_fields[0].sub_fields[0].name == '__v'
assert len(Model.__fields__['v'].sub_fields[0].sub_fields) == 1
assert Model.__fields__['v'].sub_fields[0].sub_fields[0].sub_fields[1].name == '__v_float'
assert len(Model.__fields__['v'].sub_fields[0].sub_fields[0].sub_fields) == 2