Cleanup

Author: NoahStapp

pymongo/_asyncio_task.py

@@ -19,9 +19,11 @@
 from __future__ import annotations
 
 import asyncio
+import sys
 from typing import Any, Coroutine, Optional
 
 
+# TODO (https://jira.mongodb.org/browse/PYTHON-4981): Revisit once the underlying cause of the swallowed cancellations is uncovered
 class _Task(asyncio.Task):
     def __init__(self, coro: Coroutine[Any, Any, Any], *, name: Optional[str] = None) -> None:
         super().__init__(coro, name=name)
@@ -32,9 +34,11 @@ def cancel(self, msg: Optional[str] = None) -> bool:
         self._cancelled = True
         return super().cancel(msg=msg)
 
-    def is_cancelled(self) -> bool:
+    def cancelling(self) -> bool:
         return self._cancelled
 
 
-def create_task(coro: Coroutine[Any, Any, Any], *, name: Optional[str] = None) -> _Task:
+def create_task(coro: Coroutine[Any, Any, Any], *, name: Optional[str] = None) -> asyncio.Task:
+    if sys.version_info >= (3, 11):
+        return asyncio.create_task(coro, name=name)
     return _Task(coro, name=name)

pymongo/periodic_executor.py

@@ -23,7 +23,7 @@
 import weakref
 from typing import Any, Optional
 
-from pymongo._asyncio_task import _Task, create_task
+from pymongo._asyncio_task import create_task
 from pymongo.lock import _create_lock
 
 _IS_SYNC = False
@@ -52,7 +52,7 @@ def __init__(
         self._min_interval = min_interval
         self._target = target
         self._stopped = False
-        self._task: Optional[_Task] = None
+        self._task: Optional[asyncio.Task] = None
         self._name = name
         self._skip_sleep = False
 
@@ -64,7 +64,7 @@ def open(self) -> None:
         self._stopped = False
 
         if self._task is None or (
-            self._task.done() and not self._task.cancelled() and not self._task.is_cancelled()
+            self._task.done() and not self._task.cancelled() and not self._task.cancelling()  # type: ignore[unused-ignore, attr-defined]
         ):
             self._task = create_task(self._run(), name=self._name)
 
@@ -99,7 +99,7 @@ def skip_sleep(self) -> None:
 
     async def _run(self) -> None:
         while not self._stopped:
-            if self._task and self._task.is_cancelled():
+            if self._task and self._task.cancelling():  # type: ignore[unused-ignore, attr-defined]
                 raise asyncio.CancelledError
             try:
                 if not await self._target():