Merge pull request #263 from bluetech/typing-fixes

Couple of typing fixes

Author: bluetech

CHANGELOG.rst

@@ -15,8 +15,8 @@
   Also fixed ``init_popen_io`` to use ``closefd=False`` for shared stdin and stdout file
   descriptors, preventing ``Bad file descriptor`` errors triggered by test_stdouterrin_setnull.
 * The library is now typed and the typing is exposed to type-checkers.
-* Re-exported ``Gateway`` and ``Channel`` from ``execnet``. The constructors
-  are private.
+* Re-exported ``Gateway``, ``Channel``, ``DumpError`` and ``LoadError`` from
+  ``execnet``. The constructors are private.
 * Fixed ``GatewayBase.join()`` timeout argument getting ignored.
 * Removed support for Python 3.7.
 * Added official support for Python 3.12.

src/execnet/__init__.py

@@ -11,6 +11,8 @@
 from .gateway import Gateway
 from .gateway_base import Channel
 from .gateway_base import DataFormatError
+from .gateway_base import DumpError
+from .gateway_base import LoadError
 from .gateway_base import RemoteError
 from .gateway_base import TimeoutError
 from .gateway_base import dump
@@ -41,8 +43,10 @@
     "default_group",
     "Channel",
     "dumps",
+    "dump",
+    "DumpError",
     "loads",
     "load",
-    "dump",
+    "LoadError",
     "DataFormatError",
 ]

src/execnet/gateway_base.py

@@ -911,7 +911,7 @@ def send(self, item: object) -> None:
             raise OSError(f"cannot send to {self!r}")
         self.gateway._send(Message.CHANNEL_DATA, self.id, dumps_internal(item))
 
-    def receive(self, timeout: float | None = None) -> object:
+    def receive(self, timeout: float | None = None) -> Any:
         """Receive a data item that was sent from the other side.
 
         timeout: None [default] blocked waiting. A positive number
@@ -935,10 +935,10 @@ def receive(self, timeout: float | None = None) -> object:
         else:
             return x
 
-    def __iter__(self) -> Iterator[object]:
+    def __iter__(self) -> Iterator[Any]:
         return self
 
-    def next(self) -> object:
+    def next(self) -> Any:
         try:
             return self.receive()
         except EOFError:
@@ -1403,7 +1403,7 @@ def __init__(
         else:
             self.channelfactory = gw._channelfactory
 
-    def load(self, versioned: bool = False) -> object:
+    def load(self, versioned: bool = False) -> Any:
         if versioned:
             ver = self.stream.read(1)
             if ver != DUMPFORMAT_VERSION:
@@ -1587,7 +1587,7 @@ def dump(byteio, obj: object) -> None:
 
 def loads(
     bytestring: bytes, py2str_as_py3str: bool = False, py3str_as_py2str: bool = False
-) -> object:
+) -> Any:
     """Deserialize the given bytestring to an object.
 
     py2str_as_py3str: If true then string (str) objects previously
@@ -1609,7 +1609,7 @@ def loads(
 
 def load(
     io: ReadIO, py2str_as_py3str: bool = False, py3str_as_py2str: bool = False
-) -> object:
+) -> Any:
     """Derserialize an object form the specified stream.
 
     Behaviour and parameters are otherwise the same as with ``loads``
@@ -1622,7 +1622,7 @@ def loads_internal(
     bytestring: bytes,
     channelfactory=None,
     strconfig: tuple[bool, bool] | None = None,
-) -> object:
+) -> Any:
     io = BytesIO(bytestring)
     return Unserializer(io, channelfactory, strconfig).load()
 

src/execnet/multi.py

@@ -11,6 +11,7 @@
 from functools import partial
 from threading import Lock
 from typing import TYPE_CHECKING
+from typing import Any
 from typing import Callable
 from typing import Iterable
 from typing import Iterator
@@ -277,16 +278,16 @@ def send_each(self, item: object) -> None:
             ch.send(item)
 
     @overload
-    def receive_each(self, withchannel: Literal[False] = ...) -> list[object]:
+    def receive_each(self, withchannel: Literal[False] = ...) -> list[Any]:
         pass
 
     @overload
-    def receive_each(self, withchannel: Literal[True]) -> list[tuple[Channel, object]]:
+    def receive_each(self, withchannel: Literal[True]) -> list[tuple[Channel, Any]]:
         pass
 
     def receive_each(
         self, withchannel: bool = False
-    ) -> list[tuple[Channel, object]] | list[object]:
+    ) -> list[tuple[Channel, Any]] | list[Any]:
         assert not hasattr(self, "_queue")
         l: list[object] = []
         for ch in self._channels: