From 04d81a8499b500847c2dc0e646179647b385d329 Mon Sep 17 00:00:00 2001 From: Sebastian Speitel Date: Wed, 16 Jun 2021 15:03:15 +0200 Subject: [PATCH] Allow merging dicts of different types (#5520) --- stdlib/builtins.pyi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stdlib/builtins.pyi b/stdlib/builtins.pyi index 80e04e215..de7194ed7 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -826,9 +826,9 @@ class dict(MutableMapping[_KT, _VT], Generic[_KT, _VT]): __hash__: None # type: ignore if sys.version_info >= (3, 9): def __class_getitem__(cls, item: Any) -> GenericAlias: ... - def __or__(self, __value: Mapping[_KT, _VT]) -> Dict[_KT, _VT]: ... - def __ror__(self, __value: Mapping[_KT, _VT]) -> Dict[_KT, _VT]: ... - def __ior__(self, __value: Mapping[_KT, _VT]) -> Dict[_KT, _VT]: ... + def __or__(self, __value: Mapping[_T1, _T2]) -> Dict[Union[_KT, _T1], Union[_VT, _T2]]: ... + def __ror__(self, __value: Mapping[_T1, _T2]) -> Dict[Union[_KT, _T1], Union[_VT, _T2]]: ... + def __ior__(self, __value: Mapping[_KT, _VT]) -> Dict[_KT, _VT]: ... # type: ignore class set(MutableSet[_T], Generic[_T]): def __init__(self, iterable: Iterable[_T] = ...) -> None: ...