Fix typing

mypy.ini

@@ -142,3 +142,6 @@ ignore_missing_imports = True
 
 [mypy-nacl.*]
 ignore_missing_imports = True
+
+[mypy-hiredis]
+ignore_missing_imports = True

stubs/txredisapi.pyi

@@ -16,7 +16,7 @@
 """Contains *incomplete* type hints for txredisapi.
 """
 
-from typing import List, Optional, Union
+from typing import List, Optional, Union, Type
 
 class RedisProtocol:
     def publish(self, channel: str, message: bytes): ...
@@ -42,3 +42,21 @@ def lazyConnection(
 
 class SubscriberFactory:
     def buildProtocol(self, addr): ...
+
+class ConnectionHandler: ...
+
+class RedisFactory:
+    continueTrying: bool
+    handler: RedisProtocol
+    def __init__(
+        self,
+        uuid: str,
+        dbid: Optional[int],
+        poolsize: int,
+        isLazy: bool = False,
+        handler: Type = ConnectionHandler,
+        charset: str = "utf-8",
+        password: Optional[str] = None,
+        replyTimeout: Optional[int] = None,
+        convertNumbers: Optional[int] = True,
+    ): ...

synapse/replication/tcp/redis.py

@@ -15,7 +15,7 @@
 
 import logging
 from inspect import isawaitable
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 import txredisapi
 
@@ -232,16 +232,16 @@ def buildProtocol(self, addr):
 
 def lazyConnection(
     reactor,
-    host="localhost",
-    port=6379,
-    dbid=None,
-    reconnect=True,
-    charset="utf-8",
-    password=None,
-    connectTimeout=None,
-    replyTimeout=None,
-    convertNumbers=True,
-):
+    host: str = "localhost",
+    port: int = 6379,
+    dbid: Optional[int] = None,
+    reconnect: bool = True,
+    charset: str = "utf-8",
+    password: Optional[str] = None,
+    connectTimeout: Optional[int] = None,
+    replyTimeout: Optional[int] = None,
+    convertNumbers: bool = True,
+) -> txredisapi.RedisProtocol:
     """Equivalent to `txredisapi.lazyConnection`, except allows specifying a
     reactor.
     """
@@ -265,7 +265,4 @@ def lazyConnection(
     for x in range(poolsize):
         reactor.connectTCP(host, port, factory, connectTimeout)
 
-    if isLazy:
-        return factory.handler
-    else:
-        return factory.deferred
+    return factory.handler