make the default positional-or-keyword in Mapping.get and MutableMapping.pop (#6694)

Author: Akuli

stdlib/builtins.pyi

@@ -857,6 +857,15 @@ class dict(MutableMapping[_KT, _VT], Generic[_KT, _VT]):
     @classmethod
     @overload
     def fromkeys(cls, __iterable: Iterable[_T], __value: _S) -> dict[_T, _S]: ...
+    # Positional-only in dict, but not in MutableMapping
+    @overload
+    def get(self, __key: _KT) -> _VT | None: ...
+    @overload
+    def get(self, __key: _KT, __default: _VT | _T) -> _VT | _T: ...
+    @overload
+    def pop(self, __key: _KT) -> _VT: ...
+    @overload
+    def pop(self, __key: _KT, __default: _VT | _T = ...) -> _VT | _T: ...
     def __len__(self) -> int: ...
     def __getitem__(self, __k: _KT) -> _VT: ...
     def __setitem__(self, __k: _KT, v: _VT) -> None: ...

stdlib/typing.pyi

@@ -451,9 +451,9 @@ class Mapping(Collection[_KT], Generic[_KT, _VT_co]):
     def __getitem__(self, __k: _KT) -> _VT_co: ...
     # Mixin methods
     @overload
-    def get(self, key: _KT) -> _VT_co | None: ...
+    def get(self, __key: _KT) -> _VT_co | None: ...
     @overload
-    def get(self, __key: _KT, __default: _VT_co | _T) -> _VT_co | _T: ...
+    def get(self, __key: _KT, default: _VT_co | _T) -> _VT_co | _T: ...
     def items(self) -> ItemsView[_KT, _VT_co]: ...
     def keys(self) -> KeysView[_KT]: ...
     def values(self) -> ValuesView[_VT_co]: ...
@@ -468,7 +468,7 @@ class MutableMapping(Mapping[_KT, _VT], Generic[_KT, _VT]):
     @overload
     def pop(self, __key: _KT) -> _VT: ...
     @overload
-    def pop(self, __key: _KT, __default: _VT | _T) -> _VT | _T: ...
+    def pop(self, __key: _KT, default: _VT | _T) -> _VT | _T: ...
     def popitem(self) -> tuple[_KT, _VT]: ...
     # This overload should be allowed only if the value type is compatible with None.
     @overload