Skip to content

Commit ce1d5dc

Browse files
fixed covariant mapping value type used in overload
1 parent a9fbf47 commit ce1d5dc

5 files changed

Lines changed: 5 additions & 19 deletions

File tree

stdlib/collections/__init__.pyi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ class UserDict(MutableMapping[_KT, _VT]):
106106
def __ior__(self, other: Iterable[tuple[_KT, _VT]]) -> Self: ...
107107
if sys.version_info >= (3, 12):
108108
@overload
109-
def get(self, key: _KT, default: None = None) -> _VT | None: ...
110-
@overload
111-
def get(self, key: _KT, default: _VT) -> _VT: ...
109+
def get(self, key: _KT) -> _VT | None: ...
112110
@overload
113111
def get(self, key: _KT, default: _T) -> _VT | _T: ...
114112

@@ -458,9 +456,7 @@ class ChainMap(MutableMapping[_KT, _VT]):
458456
def __len__(self) -> int: ...
459457
def __contains__(self, key: object) -> bool: ...
460458
@overload
461-
def get(self, key: _KT, default: None = None) -> _VT | None: ...
462-
@overload
463-
def get(self, key: _KT, default: _VT) -> _VT: ...
459+
def get(self, key: _KT) -> _VT | None: ...
464460
@overload
465461
def get(self, key: _KT, default: _T) -> _VT | _T: ...
466462
def __missing__(self, key: _KT) -> _VT: ... # undocumented

stdlib/os/__init__.pyi

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,9 +711,7 @@ class _Environ(MutableMapping[AnyStr, AnyStr], Generic[AnyStr]):
711711
decodevalue: _EnvironCodeFunc[AnyStr],
712712
) -> None: ...
713713
@overload
714-
def get(self, key: AnyStr, default: None = None) -> AnyStr | None: ...
715-
@overload
716-
def get(self, key: AnyStr, default: AnyStr) -> AnyStr: ...
714+
def get(self, key: AnyStr) -> AnyStr | None: ...
717715
@overload
718716
def get(self, key: AnyStr, default: _T) -> AnyStr | _T: ...
719717
@overload

stdlib/types.pyi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,6 @@ class MappingProxyType(Mapping[_KT_co, _VT_co]): # type: ignore[type-var] # py
323323
@overload
324324
def get(self, key: _KT_co, /) -> _VT_co | None: ... # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
325325
@overload
326-
def get(self, key: _KT_co, default: _VT_co, /) -> _VT_co: ... # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
327-
@overload
328326
def get(self, key: _KT_co, default: _T2, /) -> _VT_co | _T2: ... # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
329327
def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
330328
def __reversed__(self) -> Iterator[_KT_co]: ...

stdlib/typing.pyi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,6 @@ class Mapping(Collection[_KT], Generic[_KT, _VT_co]):
785785
@overload
786786
def get(self, key: _KT, /) -> _VT_co | None: ...
787787
@overload
788-
def get(self, key: _KT, default: _VT_co, /) -> _VT_co: ... # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
789-
@overload
790788
def get(self, key: _KT, default: _T, /) -> _VT_co | _T: ...
791789
def items(self) -> ItemsView[_KT, _VT_co]: ...
792790
def keys(self) -> KeysView[_KT]: ...

stdlib/weakref.pyi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ class WeakValueDictionary(MutableMapping[_KT, _VT]):
9999
__copy__ = copy
100100
def __deepcopy__(self, memo: Any) -> Self: ...
101101
@overload
102-
def get(self, key: _KT, default: None = None) -> _VT | None: ...
103-
@overload
104-
def get(self, key: _KT, default: _VT) -> _VT: ...
102+
def get(self, key: _KT) -> _VT | None: ...
105103
@overload
106104
def get(self, key: _KT, default: _T) -> _VT | _T: ...
107105
# These are incompatible with Mapping
@@ -152,9 +150,7 @@ class WeakKeyDictionary(MutableMapping[_KT, _VT]):
152150
__copy__ = copy
153151
def __deepcopy__(self, memo: Any) -> Self: ...
154152
@overload
155-
def get(self, key: _KT, default: None = None) -> _VT | None: ...
156-
@overload
157-
def get(self, key: _KT, default: _VT) -> _VT: ...
153+
def get(self, key: _KT) -> _VT | None: ...
158154
@overload
159155
def get(self, key: _KT, default: _T) -> _VT | _T: ...
160156
# These are incompatible with Mapping

0 commit comments

Comments
 (0)