Fixing stubtest issues

python · JelleZijlstra · May 25, 2025 · May 24, 2025 · May 24, 2025 · May 24, 2025
commit 33ae2dc1120b64fded6f078ddd725aded234f795
diff --git a/stdlib/@tests/stubtest_allowlists/py314.txt b/stdlib/@tests/stubtest_allowlists/py314.txt
@@ -7,9 +7,6 @@ _imp.pyc_magic_number_token
 _thread.RLock.locked
 _thread.set_name
 asyncio.__all__
-asyncio._AbstractEventLoopPolicy
-asyncio._get_event_loop_policy
-asyncio._set_event_loop_policy
 asyncio.eager_task_factory
 asyncio.tasks.eager_task_factory
 builtins.bytearray.resize

diff --git a/stdlib/@tests/stubtest_allowlists/win32-py314.txt b/stdlib/@tests/stubtest_allowlists/win32-py314.txt
@@ -3,14 +3,6 @@
 # ====================================================================

 _winapi.COPY_FILE_DIRECTORY
-asyncio.WindowsProactorEventLoopPolicy.get_child_watcher
-asyncio.WindowsProactorEventLoopPolicy.set_child_watcher
-asyncio._WindowsProactorEventLoopPolicy
-asyncio._WindowsSelectorEventLoopPolicy
-asyncio.windows_events.WindowsProactorEventLoopPolicy
-asyncio.windows_events.WindowsSelectorEventLoopPolicy
-asyncio.windows_events._WindowsProactorEventLoopPolicy
-asyncio.windows_events._WindowsSelectorEventLoopPolicy
 compression.zlib.ZLIBNG_VERSION
 ctypes.c_double_complex
 ctypes.c_float_complex

diff --git a/stdlib/asyncio/events.pyi b/stdlib/asyncio/events.pyi
@@ -28,12 +28,14 @@ if sys.version_info < (3, 14):
 # Keep asyncio.__all__ updated with any changes to __all__ here
 if sys.version_info >= (3, 14):
    __all__ = (
-        "AbstractEventLoopPolicy",
+        "_AbstractEventLoopPolicy",
        "AbstractEventLoop",
        "AbstractServer",
        "Handle",
        "TimerHandle",
+        "_get_event_loop_policy",
        "get_event_loop_policy",
+        "_set_event_loop_policy",
        "set_event_loop_policy",
        "get_event_loop",
        "set_event_loop",
@@ -600,7 +602,7 @@ class AbstractEventLoop:
    @abstractmethod
    async def shutdown_default_executor(self) -> None: ...

-class AbstractEventLoopPolicy:
+class _AbstractEventLoopPolicy:
    @abstractmethod
    def get_event_loop(self) -> AbstractEventLoop: ...
    @abstractmethod
@@ -622,20 +624,33 @@ class AbstractEventLoopPolicy:
            @abstractmethod
            def set_child_watcher(self, watcher: AbstractChildWatcher) -> None: ...

+if sys.version_info < (3, 14):
+    AbstractEventLoopPolicy = _AbstractEventLoopPolicy
+
 if sys.version_info >= (3, 14):
-    class _BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy, metaclass=ABCMeta):
+    class _BaseDefaultEventLoopPolicy(_AbstractEventLoopPolicy, metaclass=ABCMeta):
        def get_event_loop(self) -> AbstractEventLoop: ...
        def set_event_loop(self, loop: AbstractEventLoop | None) -> None: ...
        def new_event_loop(self) -> AbstractEventLoop: ...

 else:
-    class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy, metaclass=ABCMeta):
+    class BaseDefaultEventLoopPolicy(_AbstractEventLoopPolicy, metaclass=ABCMeta):
        def get_event_loop(self) -> AbstractEventLoop: ...
        def set_event_loop(self, loop: AbstractEventLoop | None) -> None: ...
        def new_event_loop(self) -> AbstractEventLoop: ...

-def get_event_loop_policy() -> AbstractEventLoopPolicy: ...
-def set_event_loop_policy(policy: AbstractEventLoopPolicy | None) -> None: ...
+if sys.version_info >= (3, 14):
+    def _get_event_loop_policy() -> _AbstractEventLoopPolicy: ...
+    def _set_event_loop_policy(policy: _AbstractEventLoopPolicy | None) -> None: ...
+
+    @deprecated("Deprecated as of Python 3.14; will be removed in Python 3.16")
+    def get_event_loop_policy() -> _AbstractEventLoopPolicy: ...
+    @deprecated("Deprecated as of Python 3.14; will be removed in Python 3.16")
+    def set_event_loop_policy(policy: _AbstractEventLoopPolicy | None) -> None: ...
+else:
+    def get_event_loop_policy() -> _AbstractEventLoopPolicy: ...
+    def set_event_loop_policy(policy: _AbstractEventLoopPolicy | None) -> None: ...
+
 def set_event_loop(loop: AbstractEventLoop | None) -> None: ...
 def new_event_loop() -> AbstractEventLoop: ...


diff --git a/stdlib/asyncio/windows_events.pyi b/stdlib/asyncio/windows_events.pyi
@@ -101,8 +101,6 @@ if sys.platform == "win32":

        class _WindowsProactorEventLoopPolicy(events._BaseDefaultEventLoopPolicy):
            _loop_factory: ClassVar[type[ProactorEventLoop]]
-            def get_child_watcher(self) -> NoReturn: ...
-            def set_child_watcher(self, watcher: Any) -> NoReturn: ...

    else:
        class WindowsSelectorEventLoopPolicy(events.BaseDefaultEventLoopPolicy):