Fix typing for py3.8

Author: ayjayt

.python_version

@@ -0,0 +1 @@
+3.8

choreographer/_brokers/_async.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import warnings
+from functools import partial
 from typing import TYPE_CHECKING
 
 import logistro
@@ -127,9 +128,11 @@ def check_read_loop_error(result: asyncio.Future[Any]) -> None:
                     raise e
 
         async def read_loop() -> None:  # noqa: PLR0912, PLR0915, C901
-            responses = await asyncio.to_thread(
-                self._channel.read_jsons,
-                blocking=True,
+            loop = asyncio.get_running_loop()
+            fn = partial(self._channel.read_jsons, blocking=True)
+            responses = await loop.run_in_executor(
+                executor=None,
+                func=fn,
             )
             _logger.debug(f"Channel read found {len(responses)} json objects.")
             for response in responses:
@@ -244,7 +247,12 @@ async def write_json(
         _logger.debug(f"Created future: {key} {future}")
         try:
             async with self._write_lock:
-                await asyncio.to_thread(self._channel.write_json, obj)
+                loop = asyncio.get_running_loop()
+                await loop.run_in_executor(
+                    None,
+                    self._channel.write_json,
+                    obj,
+                )
         except BaseException as e:  # noqa: BLE001
             future.set_exception(e)
             del self.futures[key]

choreographer/browser_async.py

@@ -131,7 +131,8 @@ def run() -> subprocess.Popen[bytes]:
             )
 
         _logger.debug("Trying to open browser.")
-        self.subprocess = await asyncio.to_thread(run)
+        loop = asyncio.get_running_loop()
+        self.subprocess = await loop.run_in_executor(None, run)
 
         super().__init__("0", self._broker)
         self._add_session(Session("", self._broker))
@@ -166,7 +167,8 @@ async def _is_closed(self, wait: int | None = 0) -> bool:
             return not _is_open
         else:
             try:
-                await asyncio.to_thread(self.subprocess.wait, wait)
+                loop = asyncio.get_running_loop()
+                await loop.run_in_executor(None, self.subprocess.wait, wait)
             except subprocess.TimeoutExpired:
                 return False
         return True
@@ -184,8 +186,8 @@ async def _close(self) -> None:
             return
         except ChannelClosedError:
             _logger.debug("Can't send Browser.close on close channel")
-
-        await asyncio.to_thread(self._channel.close)
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, self._channel.close)
 
         if await self._is_closed(wait=3):
             return
@@ -194,7 +196,8 @@ async def _close(self) -> None:
             _logger.debug("Browser is closed after closing channel")
             return
         _logger.warning("Resorting to unclean kill browser.")
-        await asyncio.to_thread(kill, self.subprocess)
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, kill, self.subprocess)
         if await self._is_closed(wait=4):
             return
         else:
@@ -237,12 +240,13 @@ async def _watchdog(self) -> None:
         with warnings.catch_warnings():
             warnings.filterwarnings("ignore", category=TmpDirWarning)
             _logger.debug("Starting watchdog")
-            await asyncio.to_thread(self.subprocess.wait)
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self.subprocess.wait)
             _logger.warning("Browser is being closed by watchdog.")
             self._watch_dog_task = None
             await self.close()
             await asyncio.sleep(1)
-            await asyncio.to_thread(self._browser_impl.clean)
+            await loop.run_in_executor(None, self._browser_impl.clean)
 
     def _add_tab(self, tab: Tab) -> None:
         if not isinstance(tab, Tab):

choreographer/channels/pipe.py

@@ -71,7 +71,7 @@ def write_json(self, obj: Mapping[str, Any]) -> None:
             raise ChannelClosedError
         encoded_message = wire.serialize(obj) + b"\0"
         _logger.debug(
-            f"Writing message {encoded_message[:15]}...{encoded_message[-15:]}, "
+            f"Writing message {encoded_message[:15]!r}...{encoded_message[-15:]!r}, "
             f"size: {len(encoded_message)}.",
         )
         _logger.debug2(f"Full Message: {encoded_message!r}")
@@ -125,13 +125,13 @@ def read_jsons(  # noqa: PLR0912, PLR0915, C901 branches, complexity
                 10000,
             )  # 10MB buffer, nbd, doesn't matter w/ this
             _logger.debug(
-                f"First read in loop: {raw_buffer[:15]}...{raw_buffer[-15:]}. "
+                f"First read in loop: {raw_buffer[:15]!r}...{raw_buffer[-15:]!r}. "
                 f"size: {len(raw_buffer)}.",
             )
             _logger.debug2(f"Whole buffer: {raw_buffer!r}")
             if not raw_buffer or raw_buffer == b"{bye}\n":
                 if raw_buffer:
-                    _logger.debug(f"Received {raw_buffer}. is bye?")
+                    _logger.debug(f"Received {raw_buffer!r}. is bye?")
                 # we seem to need {bye} even if chrome closes NOTE
                 self.close()
                 raise ChannelClosedError
@@ -152,7 +152,8 @@ def read_jsons(  # noqa: PLR0912, PLR0915, C901 branches, complexity
             # this could be hard to test as it is a real OS corner case
         finally:
             _logger.debug(
-                f"Total loops: {loop_count}, " f"Final size: {len(raw_buffer)}.",
+                f"Total loops: {loop_count}, "
+                f"Final size: {len(raw_buffer) if raw_buffer else 0}.",
             )
             _logger.debug2(f"Whole buffer: {raw_buffer!r}")
         decoded_buffer = raw_buffer.decode("utf-8")

choreographer/cli/_cli_utils.py

@@ -9,6 +9,7 @@
 import urllib.request
 import warnings
 import zipfile
+from functools import partial
 from pathlib import Path
 
 # SOON TODO this isn't the right download path, look at uv, use sysconfig
@@ -134,12 +135,11 @@ async def get_chrome(
         verbose: print out version found
 
     """
-    return await asyncio.to_thread(
-        get_chrome_sync,
-        arch=arch,
-        i=i,
-        path=path,
-        verbose=verbose,
+    loop = asyncio.get_running_loop()
+    fn = partial(get_chrome_sync, arch=arch, i=i, path=path, verbose=verbose)
+    return await loop.run_in_executor(
+        executor=None,
+        func=fn,
     )
 
 

choreographer/protocol/__init__.py

@@ -8,14 +8,14 @@
 
 from collections.abc import MutableMapping
 from enum import Enum
-from typing import Any, NewType, Optional, cast
+from typing import Any, NewType, Optional, Tuple, cast
 
 BrowserResponse = NewType("BrowserResponse", MutableMapping[str, Any])
 """The type for a response from the browser. Is really a `dict()`."""
 BrowserCommand = NewType("BrowserCommand", MutableMapping[str, Any])
 """The type for a command to the browser. Is really a `dict()`."""
 
-MessageKey = NewType("MessageKey", tuple[str, Optional[int]])
+MessageKey = NewType("MessageKey", Tuple[str, Optional[int]])
 """The type for id'ing a message/response. It is `tuple(session_id, message_id)`."""
 
 

pyproject.toml

@@ -12,7 +12,7 @@ enabled = true
 name = "choreographer"
 description = "Devtools Protocol implementation for chrome."
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 dynamic = ["version"]
 authors = [
   {name = "Andrew Pikul", email="[email protected]"},
@@ -22,7 +22,7 @@ maintainers = [
   {name = "Andrew Pikul", email = "[email protected]"},
 ]
 dependencies = [
-  "logistro>=1.0.9",
+  "logistro>=1.0.11",
   "simplejson",
 ]
 
@@ -40,10 +40,10 @@ dev = [
   "pytest-asyncio",
   "pytest-xdist",
   "async-timeout",
-  "poethepoet>=0.31.1",
   "numpy",
   "mypy>=1.14.1",
   "types-simplejson>=3.19.0.20241221",
+  "poethepoet>=0.30.0",
 ]
 
 # uv doens't allow dependency groups to have separate python requirements
@@ -58,8 +58,8 @@ dev = [
 #]
 
 [tool.uv.sources]
-mkquixote = { path = "../mkquixote", editable = true }
-logistro = { path = "../logistro", editable = true }
+#mkquixote = { path = "../mkquixote", editable = true }
+#logistro = { path = "../logistro", editable = true }
 
 [tool.ruff.lint]
 select = ["ALL"]