Add @disjoint_base decorator to the third-party stubs (#14716)

Author: brianschubert

stubs/PyYAML/yaml/_yaml.pyi

@@ -1,14 +1,15 @@
 from _typeshed import Incomplete, SupportsRead
 from collections.abc import Mapping, Sequence
 from typing import IO, Any
+from typing_extensions import disjoint_base
 
 from .events import Event
 from .nodes import Node
 from .tokens import Token
 
 def get_version_string() -> str: ...
 def get_version() -> tuple[int, int, int]: ...
-
+@disjoint_base
 class Mark:
     name: Any
     index: int
@@ -19,6 +20,7 @@ class Mark:
     def __init__(self, name, index: int, line: int, column: int, buffer, pointer) -> None: ...
     def get_snippet(self): ...
 
+@disjoint_base
 class CParser:
     def __init__(self, stream: str | bytes | SupportsRead[str | bytes]) -> None: ...
     def dispose(self) -> None: ...
@@ -34,6 +36,7 @@ class CParser:
     def raw_parse(self) -> int: ...
     def raw_scan(self) -> int: ...
 
+@disjoint_base
 class CEmitter:
     def __init__(
         self,

stubs/cffi/_cffi_backend.pyi

@@ -3,7 +3,7 @@ import types
 from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer
 from collections.abc import Callable, Hashable
 from typing import Any, ClassVar, Literal, Protocol, SupportsIndex, TypeVar, final, overload, type_check_only
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias, disjoint_base
 
 _T = TypeVar("_T")
 
@@ -111,6 +111,7 @@ class buffer:
 _tmp_CType = CType
 _tmp_buffer = buffer
 
+@disjoint_base
 class FFI:
     CData: TypeAlias = _CDataBase
     CType: TypeAlias = _tmp_CType

stubs/gdb/gdb/__init__.pyi

@@ -7,7 +7,7 @@ import threading
 from collections.abc import Callable, Iterator, Mapping, Sequence
 from contextlib import AbstractContextManager
 from typing import Any, Final, Generic, Literal, Protocol, TypedDict, TypeVar, final, overload, type_check_only
-from typing_extensions import TypeAlias, deprecated
+from typing_extensions import TypeAlias, deprecated, disjoint_base
 
 import gdb.FrameDecorator
 import gdb.types
@@ -74,6 +74,7 @@ class GdbError(Exception): ...
 _ValueOrNative: TypeAlias = bool | int | float | str | Value | LazyString
 _ValueOrInt: TypeAlias = Value | int
 
+@disjoint_base
 class Value:
     address: Value
     is_optimized_out: bool
@@ -406,6 +407,7 @@ class RecordFunctionSegment:
 
 # CLI Commands
 
+@disjoint_base
 class Command:
     def __init__(self, name: str, command_class: int, completer_class: int = ..., prefix: bool = ...) -> None: ...
     def dont_repeat(self) -> None: ...
@@ -437,6 +439,7 @@ COMPLETE_EXPRESSION: int
 
 # GDB/MI Commands
 
+@disjoint_base
 class MICommand:
     name: str
     installed: bool
@@ -446,6 +449,7 @@ class MICommand:
 
 # Parameters
 
+@disjoint_base
 class Parameter:
     set_doc: str
     show_doc: str
@@ -682,6 +686,7 @@ class LineTable:
 
 # Breakpoints
 
+@disjoint_base
 class Breakpoint:
     # The where="spec" form of __init__().  See py-breakpoints.c:bppy_init():keywords for the positional order.
     @overload
@@ -854,6 +859,7 @@ WP_ACCESS: int
 
 # Finish Breakpoints
 
+@disjoint_base
 class FinishBreakpoint(Breakpoint):
     return_value: Value | None
 
@@ -907,6 +913,7 @@ class RegisterGroupsIterator(Iterator[RegisterGroup]):
 
 # Connections
 
+@disjoint_base
 class TargetConnection:
     def is_valid(self) -> bool: ...
 
@@ -941,6 +948,7 @@ class _Window(Protocol):
     def click(self, x: int, y: int, button: int) -> None: ...
 
 # Events
+@disjoint_base
 class Event: ...
 
 class ThreadEvent(Event):

stubs/gdb/gdb/disassembler.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from typing import Final, final
+from typing_extensions import disjoint_base
 
 import gdb
 from gdb import Architecture, Progspace
@@ -8,6 +9,7 @@ class Disassembler:
     def __init__(self, name: str) -> None: ...
     def __call__(self, info): ...
 
+@disjoint_base
 class DisassembleInfo:
     address: int
     architecture: Architecture

stubs/gevent/@tests/stubtest_allowlist.txt

@@ -64,6 +64,10 @@ gevent.socket.SocketType.makefile
 gevent.socket.SocketType.sendfile
 gevent.socket.SocketType.set_inheritable
 
+# Pretends to re-export a type marked @disjoint_base in the stubs, but runtime
+# defines __slots__
+gevent.socket.SocketType$
+
 # zope.interface related attributes we can ignore
 gevent.[\w\.]+\.__implemented__
 gevent.[\w\.]+\.__providedBy__

stubs/gevent/gevent/_greenlet_primitives.pyi

@@ -1,11 +1,13 @@
 from abc import abstractmethod
 from typing import Any, NoReturn
+from typing_extensions import disjoint_base
 
 from gevent._types import _Loop
 from greenlet import greenlet
 
 class TrackedRawGreenlet(greenlet): ...
 
+@disjoint_base
 class SwitchOutGreenletWithLoop(TrackedRawGreenlet):
     @property
     @abstractmethod

stubs/gevent/gevent/_hub_primitives.pyi

@@ -2,7 +2,7 @@ from _typeshed import FileDescriptor
 from collections.abc import Callable, Collection, Iterable
 from types import TracebackType
 from typing import Any, Generic, Protocol, TypeVar, overload, type_check_only
-from typing_extensions import Self, TypeVarTuple, Unpack
+from typing_extensions import Self, TypeVarTuple, Unpack, disjoint_base
 
 from gevent._greenlet_primitives import SwitchOutGreenletWithLoop
 from gevent._types import _Loop, _Watcher
@@ -32,6 +32,7 @@ class WaitOperationsGreenlet(SwitchOutGreenletWithLoop):
     ) -> None: ...
     def cancel_wait(self, watcher: _Watcher, error: type[BaseException] | BaseException, close_watcher: bool = False) -> None: ...
 
+@disjoint_base
 class _WaitIterator(Generic[_T]):
     def __init__(self, objects: Collection[_T], hub: Hub, timeout: float, count: None | int) -> None: ...
     def __enter__(self) -> Self: ...

stubs/gevent/gevent/_imap.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Callable, Iterable
 from typing import Any, TypeVar
-from typing_extensions import ParamSpec, Self
+from typing_extensions import ParamSpec, Self, disjoint_base
 
 from gevent.greenlet import Greenlet
 from gevent.queue import UnboundQueue
@@ -12,6 +12,7 @@ _P = ParamSpec("_P")
 # returned by some public API functions, we don't bother adding a whole bunch of overloads to handle
 # the case of 1-n Iterables being passed in and just go for the fully unsafe signature
 # we do the crazy overloads instead in the functions that create these objects
+@disjoint_base
 class IMapUnordered(Greenlet[_P, _T]):
     finished: bool
     # it may contain an undocumented Failure object
@@ -20,6 +21,7 @@ class IMapUnordered(Greenlet[_P, _T]):
     def __iter__(self) -> Self: ...
     def __next__(self) -> _T: ...
 
+@disjoint_base
 class IMap(IMapUnordered[_P, _T]):
     index: int
 

stubs/gevent/gevent/greenlet.pyi

@@ -2,7 +2,7 @@ import weakref
 from collections.abc import Callable, Iterable, Sequence
 from types import FrameType, TracebackType
 from typing import Any, ClassVar, Generic, TypeVar, overload
-from typing_extensions import ParamSpec, Self
+from typing_extensions import ParamSpec, Self, disjoint_base
 
 import greenlet
 from gevent._types import _Loop
@@ -12,6 +12,7 @@ _T = TypeVar("_T")
 _G = TypeVar("_G", bound=greenlet.greenlet)
 _P = ParamSpec("_P")
 
+@disjoint_base
 class Greenlet(greenlet.greenlet, Generic[_P, _T]):
     # we can't use _P.args/_P.kwargs here because pyright will complain
     # mypy doesn't seem to mind though

stubs/gevent/gevent/libev/corecext.pyi

@@ -3,7 +3,7 @@ from _typeshed import FileDescriptor
 from collections.abc import Callable, Sequence
 from types import TracebackType
 from typing import Any
-from typing_extensions import ParamSpec
+from typing_extensions import ParamSpec, disjoint_base
 
 from gevent._ffi.loop import _ErrorHandler
 from gevent._types import _Callback
@@ -20,7 +20,7 @@ if sys.platform != "win32":
     def recommended_backends() -> list[str | int]: ...
     def supported_backends() -> list[str | int]: ...
     def time() -> float: ...
-
+    @disjoint_base
     class loop:
         starting_timer_may_update_loop_time: bool
         error_handler: _ErrorHandler