After some footling, decided on leaving disallow_any_decorated OFF

Author: ThosRTanner

kazoo/client.py

@@ -424,8 +424,12 @@ def __init__(
 
         # also this should be called with a func that returns nothing as the
         # 1st argument.
-        def _retry(*args: Any, **kwargs: Any) -> Any:
-            return self._retry.copy()(*args, **kwargs)
+        def _retry(
+            func: Callable[..., KazooRetry.RETRY_RETURN],
+            *args: Any,
+            **kwargs: Any,
+        ) -> KazooRetry.RETRY_RETURN:
+            return self._retry.copy()(func, *args, **kwargs)
 
         # (expression has type "Callable[[VarArg(Any), KwArg(Any)], Any]",
         # variable has type "KazooRetry") so basically self.retry needs to be
@@ -500,7 +504,7 @@ def client_state(self) -> KeeperState:
         return self._state
 
     @property
-    def client_id(self) -> tuple[Any, Any] | None:
+    def client_id(self) -> tuple[int | None, bytes] | None:
         """Returns the client id for this Zookeeper session if
         connected.
 

kazoo/handlers/eventlet.py

@@ -20,7 +20,7 @@
 from kazoo.handlers.utils import selector_select
 
 if TYPE_CHECKING:
-    from kazoo.interfaces import Event, Lockable, ReentrantLock, Socket
+    from kazoo.interfaces import Event, FdLike, Lockable, ReentrantLock, Socket
     from kazoo.protocol.states import Callback
 
 
@@ -201,7 +201,7 @@ def create_connection(self, *args: Any, **kwargs: Any) -> Socket:
 
     def select(
         self, *args: Any, **kwargs: Any
-    ) -> tuple[list[int], list[int], list[int]]:
+    ) -> tuple[list[FdLike], list[FdLike], list[FdLike]]:
         with _yield_before_after():
             # Following appears to be a bug in mypy (see
             # https://github.com/python/mypy/issues/6799)

kazoo/handlers/gevent.py

@@ -24,7 +24,7 @@
 from kazoo.handlers import utils
 
 if TYPE_CHECKING:
-    from kazoo.interfaces import HasFileNo, Lockable, Socket
+    from kazoo.interfaces import FdLike, Lockable, Socket
     from kazoo.protocol.states import Callback
 
 _using_libevent = gevent.__version__.startswith("0.")
@@ -146,11 +146,7 @@ def stop(self) -> None:
 
     def select(
         self, *args: Any, **kwargs: Any
-    ) -> tuple[
-        Iterable[int | HasFileNo],
-        Iterable[int | HasFileNo],
-        Iterable[int | HasFileNo],
-    ]:
+    ) -> tuple[Iterable[FdLike], Iterable[FdLike], Iterable[FdLike]]:
         # FIXME use the correct arguments, not *args, *kwargs
         return selector_select(
             # Likely a bug in mypy (see

kazoo/handlers/threading.py

@@ -30,7 +30,7 @@
 if TYPE_CHECKING:
     from kazoo.interfaces import (
         Event,
-        HasFileNo,
+        FdLike,
         Lockable,
         ReentrantLock,
         Socket,
@@ -187,11 +187,7 @@ def stop(self) -> None:
 
     def select(
         self, *args: Any, **kwargs: Any
-    ) -> tuple[
-        Iterable[int | HasFileNo],
-        Iterable[int | HasFileNo],
-        Iterable[int | HasFileNo],
-    ]:
+    ) -> tuple[Iterable[FdLike], Iterable[FdLike], Iterable[FdLike]]:
         return selector_select(*args, **kwargs)
 
     def socket(self) -> Socket:

kazoo/handlers/utils.py

@@ -11,9 +11,10 @@
 import socket
 import time
 from types import ModuleType
-from typing import Any, Callable, TYPE_CHECKING
+from typing import Any, Callable, Iterable, TypeVar, TYPE_CHECKING
 
-from kazoo.interfaces import IAsyncResult
+
+from kazoo.interfaces import IAsyncResult, FdLike
 
 if TYPE_CHECKING:
     from kazoo.interfaces import Socket
@@ -323,23 +324,33 @@ def create_tcp_connection(
     return sock
 
 
+CapturedResult = TypeVar("CapturedResult")
+
+
 def capture_exceptions(
     async_result: IAsyncResult,
-) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
+) -> Callable[
+    [Callable[..., CapturedResult]], Callable[..., CapturedResult | None]
+]:
     """Return a new decorated function that propagates the exceptions of the
     wrapped function to an async_result.
 
     :param async_result: An async result implementing :class:`IAsyncResult`
 
     """
 
-    def capture(function: Callable[..., Any]) -> Callable[..., Any]:
+    def capture(
+        function: Callable[..., CapturedResult]
+    ) -> Callable[..., CapturedResult | None]:
         @functools.wraps(function)
-        def captured_function(*args: Any, **kwargs: Any) -> Any:
+        def captured_function(
+            *args: Any, **kwargs: Any
+        ) -> CapturedResult | None:
             try:
                 return function(*args, **kwargs)
             except Exception as exc:
                 async_result.set_exception(exc)
+                return None
 
         return captured_function
 
@@ -348,7 +359,9 @@ def captured_function(*args: Any, **kwargs: Any) -> Any:
 
 def wrap(
     async_result: IAsyncResult,
-) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
+) -> Callable[
+    [Callable[..., CapturedResult]], Callable[..., CapturedResult | None]
+]:
     """Return a new decorated function that propagates the return value or
     exception of wrapped function to an async_result.  NOTE: Only propagates a
     non-None return value.
@@ -357,9 +370,13 @@ def wrap(
 
     """
 
-    def capture(function: Callable[..., Any]) -> Callable[..., Any]:
+    def capture(
+        function: Callable[..., CapturedResult]
+    ) -> Callable[..., CapturedResult | None]:
         @capture_exceptions(async_result)
-        def captured_function(*args: Any, **kwargs: Any) -> Any:
+        def captured_function(
+            *args: Any, **kwargs: Any
+        ) -> CapturedResult | None:
             value = function(*args, **kwargs)
             if value is not None:
                 async_result.set(value)
@@ -370,7 +387,7 @@ def captured_function(*args: Any, **kwargs: Any) -> Any:
     return capture
 
 
-def fileobj_to_fd(fileobj: Any) -> int:
+def fileobj_to_fd(fileobj: FdLike) -> int:
     """Return a file descriptor from a file object.
 
     Parameters:
@@ -385,22 +402,25 @@ def fileobj_to_fd(fileobj: Any) -> int:
     if isinstance(fileobj, int):
         fd = fileobj
     else:
+        # FIXME given the protocol I don't think the try/catch/int are
+        # required.
         try:
             fd = int(fileobj.fileno())
         except (AttributeError, TypeError, ValueError):
             raise TypeError("Invalid file object: " "{!r}".format(fileobj))
+    # FIXME Questionable, just let select deal with it.
     if fd < 0:
         raise TypeError("Invalid file descriptor: {}".format(fd))
     return fd
 
 
 def selector_select(
-    rlist: list[Any],
-    wlist: list[Any],
-    xlist: list[Any],
+    rlist: Iterable[FdLike],
+    wlist: Iterable[FdLike],
+    xlist: Iterable[FdLike],
     timeout: float | None = None,
     selectors_module: ModuleType = selectors,
-) -> tuple[list[int], list[int], list[int]]:
+) -> tuple[list[FdLike], list[FdLike], list[FdLike]]:
     """Selector-based drop-in replacement for select to overcome select
     limitation on a maximum filehandle value.
     """
@@ -415,7 +435,7 @@ def selector_select(
         selectors_module.EVENT_WRITE: wlist,
     }
     fd_events: defaultdict[int, int] = defaultdict(int)
-    fd_fileobjs: defaultdict[int, list[int]] = defaultdict(list)
+    fd_fileobjs: defaultdict[int, list[FdLike]] = defaultdict(list)
 
     for event, fileobjs in events_mapping.items():
         for fileobj in fileobjs:
@@ -431,9 +451,9 @@ def selector_select(
             # gevent can raise OSError
             raise ValueError("Invalid event mask or fd") from e
 
-    revents: list[int] = []
-    wevents: list[int] = []
-    xevents: list[int] = []
+    revents: list[FdLike] = []
+    wevents: list[FdLike] = []
+    xevents: list[FdLike] = []
     try:
         ready = selector.select(timeout)
     finally:

kazoo/interfaces.py

@@ -18,6 +18,7 @@
     Callable,
     Iterable,
     Protocol,
+    Union,
     TYPE_CHECKING,
 )
 
@@ -28,12 +29,15 @@
 
 
 class HasFileNo(Protocol):
-    """Protocol for things like select"""
+    """Protocol for objects that support a fileno method."""
 
     def fileno(self) -> int:
         ...
 
 
+FdLike = Union[int, HasFileNo]
+
+
 class Socket(HasFileNo, Protocol):
     """This is for things that provide a socket.socket-like interface.
 
@@ -176,15 +180,11 @@ def stop(self) -> None:
     @abc.abstractmethod
     def select(
         self,
-        rlist: Iterable[int | HasFileNo],
-        wlist: Iterable[int | HasFileNo],
-        xlist: Iterable[int | HasFileNo],
+        rlist: Iterable[FdLike],
+        wlist: Iterable[FdLike],
+        xlist: Iterable[FdLike],
         timeout: float | None = None,
-    ) -> tuple[
-        Iterable[int | HasFileNo],
-        Iterable[int | HasFileNo],
-        Iterable[int | HasFileNo],
-    ]:
+    ) -> tuple[Iterable[FdLike], Iterable[FdLike], Iterable[FdLike]]:
         """A select method that implements Python's select.select
         API"""
 

kazoo/protocol/connection.py

@@ -11,7 +11,7 @@
 import socket
 import ssl
 import time
-from typing import Any, Iterator, Literal, TYPE_CHECKING, cast
+from typing import Any, Iterator, Literal, TypeVar, TYPE_CHECKING, cast
 
 from kazoo.exceptions import (
     AuthFailedError,
@@ -163,6 +163,9 @@ class RWServerAvailable(Exception):
     """Thrown if a RW Server becomes available"""
 
 
+ReturnValue = TypeVar("ReturnValue")
+
+
 class ConnectionHandler(object):
     """Zookeeper connection handler"""
 
@@ -203,7 +206,7 @@ def __init__(
     # This is instance specific to avoid odd thread bug issues in Python
     # during shutdown global cleanup
     @contextmanager
-    def _socket_error_handling(self) -> Any:
+    def _socket_error_handling(self) -> Iterator[None]:
         try:
             yield
         except (socket.error, select.error) as e: