reverted Mapping.get changes, lets first try dict only

Author: randolf-scholz

stdlib/builtins.pyi

@@ -1218,8 +1218,14 @@ class dict(MutableMapping[_KT, _VT]):
     @classmethod
     @overload
     def fromkeys(cls, iterable: Iterable[_T], value: _S, /) -> dict[_T, _S]: ...
-    # get: inherited from Mapping
-    # pop: inherited from MutableMapping
+    @overload
+    def get(self, key: object, /) -> _VT | None: ...
+    @overload
+    def get(self, key: object, default: _T, /) -> _VT | _T: ...
+    @overload  # type: ignore[override]
+    def pop(self, key: object, /) -> _VT | None: ...
+    @overload
+    def pop(self, key: object, default: _T, /) -> _VT | _T: ...
     def __len__(self) -> int: ...
     def __getitem__(self, key: _KT, /) -> _VT: ...
     def __setitem__(self, key: _KT, value: _VT, /) -> None: ...

stdlib/collections/__init__.pyi

@@ -105,12 +105,15 @@ class UserDict(MutableMapping[_KT, _VT]):
     @overload
     def __ior__(self, other: Iterable[tuple[_KT, _VT]]) -> Self: ...
     if sys.version_info >= (3, 12):
+        # UserDict allows key and default as keyword arguments
         @overload
-        def get(self, key: _KT, default: None = None) -> _VT | None: ...
+        def get(self, key: object) -> _VT | None: ...
         @overload
-        def get(self, key: _KT, default: _VT) -> _VT: ...
+        def get(self, key: object, default: _T) -> _VT | _T: ...
+        @overload  # type: ignore[override]
+        def pop(self, key: object) -> _VT | None: ...
         @overload
-        def get(self, key: _KT, default: _T) -> _VT | _T: ...
+        def pop(self, key: object, default: _T) -> _VT | _T: ...
 
 class UserList(MutableSequence[_T]):
     data: list[_T]
@@ -381,12 +384,10 @@ class OrderedDict(dict[_KT, _VT]):
     @overload
     def setdefault(self, key: _KT, default: _VT) -> _VT: ...
     # Same as dict.pop, but accepts keyword arguments
+    @overload  # type: ignore[override]
+    def pop(self, key: object) -> _VT | None: ...
     @overload
-    def pop(self, key: _KT) -> _VT: ...
-    @overload
-    def pop(self, key: _KT, default: _VT) -> _VT: ...
-    @overload
-    def pop(self, key: _KT, default: _T) -> _VT | _T: ...
+    def pop(self, key: object, default: _T) -> _VT | _T: ...
     def __eq__(self, value: object, /) -> bool: ...
     @overload
     def __or__(self, value: dict[_KT, _VT], /) -> Self: ...

stdlib/typing.pyi

@@ -773,10 +773,12 @@ class Mapping(Collection[_KT], Generic[_KT, _VT_co]):
     @abstractmethod
     def __getitem__(self, key: _KT, /) -> _VT_co: ...
     # Mixin methods
-    @overload  # intentionally positional-only
-    def get(self, key: Any, /) -> _VT_co | None: ...
-    @overload  # intentionally positional-only
-    def get(self, key: Any, default: _T, /) -> _VT_co | _T: ...
+    @overload
+    def get(self, key: _KT, /) -> _VT_co | None: ...
+    @overload
+    def get(self, key: _KT, default: _VT_co, /) -> _VT_co: ...  # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] # Covariant type as parameter
+    @overload
+    def get(self, key: _KT, default: _T, /) -> _VT_co | _T: ...
     def items(self) -> ItemsView[_KT, _VT_co]: ...
     def keys(self) -> KeysView[_KT]: ...
     def values(self) -> ValuesView[_VT_co]: ...
@@ -789,10 +791,12 @@ class MutableMapping(Mapping[_KT, _VT]):
     @abstractmethod
     def __delitem__(self, key: _KT, /) -> None: ...
     def clear(self) -> None: ...
-    @overload  # intentionally positional-only
-    def pop(self, key: Any, /) -> _VT | None: ...
-    @overload  # intentionally positional-only
-    def pop(self, key: Any, default: _T, /) -> _VT | _T: ...
+    @overload
+    def pop(self, key: _KT, /) -> _VT: ...
+    @overload
+    def pop(self, key: _KT, default: _VT, /) -> _VT: ...
+    @overload
+    def pop(self, key: _KT, default: _T, /) -> _VT | _T: ...
     def popitem(self) -> tuple[_KT, _VT]: ...
     # This overload should be allowed only if the value type is compatible with None.
     #