cleanup + fix subtypes

Author: randolf-scholz

stdlib/collections/__init__.pyi

@@ -384,6 +384,8 @@ class OrderedDict(dict[_KT, _VT]):
     @overload
     def pop(self, key: object) -> _VT: ...
     @overload
+    def pop(self, key: object, default: _VT) -> _VT: ...
+    @overload
     def pop(self, key: object, default: _T) -> _VT | _T: ...
     def __eq__(self, value: object, /) -> bool: ...
     @overload
@@ -469,9 +471,11 @@ class ChainMap(MutableMapping[_KT, _VT]):
     @overload
     def setdefault(self, key: _KT, default: _VT) -> _VT: ...
     @overload
-    def pop(self, key: _KT) -> _VT: ...
+    def pop(self, key: Any) -> _VT: ...
+    @overload
+    def pop(self, key: Any, default: _VT) -> _VT: ...
     @overload
-    def pop(self, key: _KT, default: _T) -> _VT | _T: ...
+    def pop(self, key: Any, default: _T) -> _VT | _T: ...
     def copy(self) -> Self: ...
     __copy__ = copy
     # All arguments to `fromkeys` are passed to `dict.fromkeys` at runtime,

stdlib/mailbox.pyi

@@ -88,7 +88,7 @@ class Mailbox(Generic[_MessageT]):
     def __len__(self) -> int: ...
     def clear(self) -> None: ...
     @overload
-    def pop(self, key: str, default: None = None) -> _MessageT | None: ...
+    def pop(self, key: str, default) -> _MessageT | None: ...
     @overload
     def pop(self, key: str, default: _T) -> _MessageT | _T: ...
     def popitem(self) -> tuple[str, _MessageT]: ...

stdlib/multiprocessing/managers.pyi

@@ -88,6 +88,8 @@ if sys.version_info >= (3, 13):
         @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 keys(self) -> list[_KT]: ...  # type: ignore[override]
         def items(self) -> list[tuple[_KT, _VT]]: ...  # type: ignore[override]
@@ -114,6 +116,8 @@ else:
         @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 keys(self) -> list[_KT]: ...  # type: ignore[override]
         def items(self) -> list[tuple[_KT, _VT]]: ...  # type: ignore[override]

stdlib/os/__init__.pyi

@@ -719,6 +719,8 @@ class _Environ(MutableMapping[AnyStr, AnyStr], Generic[AnyStr]):
     @overload
     def pop(self, key: AnyStr) -> AnyStr: ...
     @overload
+    def pop(self, key: AnyStr, default: AnyStr) -> AnyStr: ...
+    @overload
     def pop(self, key: AnyStr, default: _T) -> AnyStr | _T: ...
     def setdefault(self, key: AnyStr, value: AnyStr) -> AnyStr: ...
     def copy(self) -> dict[AnyStr, AnyStr]: ...

stdlib/weakref.pyi

@@ -112,9 +112,11 @@ class WeakValueDictionary(MutableMapping[_KT, _VT]):
     def valuerefs(self) -> list[KeyedRef[_KT, _VT]]: ...
     def setdefault(self, key: _KT, default: _VT) -> _VT: ...
     @overload
-    def pop(self, key: _KT) -> _VT: ...
+    def pop(self, key: object) -> _VT: ...
     @overload
-    def pop(self, key: _KT, default: _T) -> _VT | _T: ...
+    def pop(self, key: object, default: _VT) -> _VT: ...
+    @overload
+    def pop(self, key: object, default: _T) -> _VT | _T: ...
     @overload
     def update(self, other: SupportsKeysAndGetItem[_KT, _VT], /, **kwargs: _VT) -> None: ...
     @overload
@@ -166,9 +168,11 @@ class WeakKeyDictionary(MutableMapping[_KT, _VT]):
     @overload
     def setdefault(self, key: _KT, default: _VT) -> _VT: ...
     @overload
-    def pop(self, key: _KT) -> _VT: ...
+    def pop(self, key: object) -> _VT: ...
+    @overload
+    def pop(self, key: object, default: _VT) -> _VT: ...
     @overload
-    def pop(self, key: _KT, default: _T) -> _VT | _T: ...
+    def pop(self, key: object, default: _T) -> _VT | _T: ...
     @overload
     def update(self, dict: SupportsKeysAndGetItem[_KT, _VT], /, **kwargs: _VT) -> None: ...
     @overload