Skip to content

Sync typeshed #21232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Sync typeshed #21232

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc2b0d1
Sync typeshed
Apr 15, 2026
46c81f5
Adjust stubs to fix mypy lookup error due to circular dependencies in…
cdce8p Feb 18, 2026
042e0b0
Partially revert Clean up argparse hacks
cdce8p Feb 15, 2025
68047c4
Remove use of LiteralString in builtins (#13743)
hauntsaninja Sep 26, 2022
bbd1965
Revert Remove redundant inheritances from Iterator in builtins
cdce8p Dec 21, 2024
fa4ba51
Revert Use contravariant type variable in Container
cdce8p Feb 23, 2026
3d84558
Revert dict.__or__ typeshed change
ilevkivskyi Apr 7, 2026
533aa6b
Revert sum literal integer change (#13961)
hauntsaninja Oct 29, 2022
8c2b983
Revert typeshed ctypes change
AlexWaygood May 1, 2023
196e129
Temporarily revert contextlib deprecation
hauntsaninja Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert dict.__or__ typeshed change
  • Loading branch information
@ilevkivskyi
ilevkivskyi authored and mypybot committed Apr 15, 2026
commit 3d84558a4d9892a7cee51fe9a1a37a493b4e2532
6 changes: 6 additions & 0 deletions mypy/typeshed/stdlib/builtins.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,13 @@ class dict(MutableMapping[_KT, _VT]):
def __reversed__(self) -> Iterator[_KT]: ...
__hash__: ClassVar[None] # type: ignore[assignment]
def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
@overload
def __or__(self, value: dict[_KT, _VT], /) -> dict[_KT, _VT]: ...
@overload
def __or__(self, value: dict[_T1, _T2], /) -> dict[_KT | _T1, _VT | _T2]: ...
@overload
def __ror__(self, value: dict[_KT, _VT], /) -> dict[_KT, _VT]: ...
@overload
def __ror__(self, value: dict[_T1, _T2], /) -> dict[_KT | _T1, _VT | _T2]: ...
# dict.__ior__ should be kept roughly in line with MutableMapping.update()
@overload # type: ignore[misc]
Expand Down