From f41ac92b3ce7b853689e7a9733e6c89b704c6859 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Tue, 9 Aug 2022 13:20:15 +0300 Subject: [PATCH] fix main.BaseModel.(dict, json) fields types (#4293) * fix main.BaseModel.(dict, json) fields types fix main.BaseModel.dict fields (include, exclude, skip_defaults) types fix main.BaseModel.json fields (include, exclude, skip_defaults) types * fix types for BaseModel.copy, BaseModel._iter fix types for BaseModel.copy fields: include, exclude, update BaseModel._iter fields: include, exclude --- pydantic/main.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pydantic/main.py b/pydantic/main.py index 01afe5fc65..3228e833c0 100644 --- a/pydantic/main.py +++ b/pydantic/main.py @@ -420,10 +420,10 @@ def _init_private_attributes(self) -> None: def dict( self, *, - include: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, - exclude: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, + include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, + exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, by_alias: bool = False, - skip_defaults: bool = None, + skip_defaults: Optional[bool] = None, exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False, @@ -456,10 +456,10 @@ def dict( def json( self, *, - include: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, - exclude: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, + include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, + exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, by_alias: bool = False, - skip_defaults: bool = None, + skip_defaults: Optional[bool] = None, exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False, @@ -621,9 +621,9 @@ def _copy_and_set_values(self: 'Model', values: 'DictStrAny', fields_set: 'SetSt def copy( self: 'Model', *, - include: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, - exclude: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, - update: 'DictStrAny' = None, + include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, + exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, + update: Optional['DictStrAny'] = None, deep: bool = False, ) -> 'Model': """ @@ -805,8 +805,8 @@ def _iter( self, to_dict: bool = False, by_alias: bool = False, - include: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, - exclude: Union['AbstractSetIntStr', 'MappingIntStrAny'] = None, + include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, + exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None, exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False,