fix: Support TcpFakeServer for Python 3.9 (#411)

Author: phi-friday

fakeredis/__init__.py

@@ -1,5 +1,3 @@
-import sys
-
 from . import _typing
 from ._connection import (
     FakeRedis,
@@ -11,14 +9,7 @@
     FakeRedis as FakeAsyncRedis,
     FakeConnection as FakeAsyncConnection,
 )
-
-if sys.version_info >= (3, 11):
-    from ._tcp_server import TcpFakeServer
-else:
-
-    class TcpFakeServer:
-        def __init__(self, *args, **kwargs):
-            raise NotImplementedError("TcpFakeServer is only available in Python 3.11+")
+from ._tcp_server import TcpFakeServer
 
 
 __version__ = _typing.lib_version

fakeredis/_tcp_server.py

@@ -1,8 +1,9 @@
 import logging
 from dataclasses import dataclass
+from io import BufferedIOBase
 from itertools import count
 from socketserver import ThreadingTCPServer, StreamRequestHandler
-from typing import BinaryIO, Dict, Tuple, Any
+from typing import Dict, Tuple, Any, Union
 
 from fakeredis import FakeRedis
 from fakeredis import FakeServer
@@ -13,7 +14,7 @@
 # logging.basicConfig(level=logging.DEBUG)
 
 
-def to_bytes(value) -> bytes:
+def to_bytes(value: Any) -> bytes:
     if isinstance(value, bytes):
         return value
     return str(value).encode()
@@ -27,37 +28,36 @@ class Client:
 
 @dataclass
 class Reader:
-    reader: BinaryIO
+    reader: BufferedIOBase
 
     def load(self) -> Any:
         line = self.reader.readline().strip()
-        match line[0:1], line[1:]:
-            case b"*", length:
-                length = int(length)
-                array = [None] * length
-                for i in range(length):
-                    array[i] = self.load()
-                return array
-            case b"$", length:
-                bulk_string = self.reader.read(int(length) + 2).strip()
-                if len(bulk_string) != int(length):
-                    raise ValueError()
-                return bulk_string
-            case b":", value:
-                return int(value)
-            case b"+", value:
-                return value
-            case b"-", value:
-                return Exception(value)
-            case _:
-                return None
+        prefix, rest = line[0:1], line[1:]
+        if prefix == b"*":
+            length = int(rest)
+            array = [None] * length
+            for i in range(length):
+                array[i] = self.load()
+            return array
+        if prefix == b"$":
+            bulk_string = self.reader.read(int(rest) + 2).strip()
+            if len(bulk_string) != int(rest):
+                raise ValueError()
+            return bulk_string
+        if prefix == b":":
+            return int(rest)
+        if prefix == b"+":
+            return rest
+        if prefix == b"-":
+            return Exception(rest)
+        return None
 
 
 @dataclass
 class Writer:
-    writer: BinaryIO
+    writer: BufferedIOBase
 
-    def dump(self, value: Any, dump_bulk=False) -> None:
+    def dump(self, value: Any, dump_bulk: bool = False) -> None:
         if isinstance(value, int):
             self.writer.write(f":{value}\r\n".encode())
         elif isinstance(value, (str, bytes)):
@@ -77,6 +77,8 @@ def dump(self, value: Any, dump_bulk=False) -> None:
 
 
 class TCPFakeRequestHandler(StreamRequestHandler):
+    server: "TcpFakeServer"  # type: ignore
+
     def setup(self) -> None:
         super().setup()
         if self.client_address in self.server.clients:
@@ -90,7 +92,7 @@ def setup(self) -> None:
             self.writer = Writer(self.wfile)
             self.server.clients[self.client_address] = self.current_client
 
-    def handle(self):
+    def handle(self) -> None:
         LOGGER.debug(f"+++ {self.client_address[0]} connected")
         while True:
             try:
@@ -117,7 +119,7 @@ def finish(self) -> None:
 class TcpFakeServer(ThreadingTCPServer):
     def __init__(
         self,
-        server_address: Tuple[str | bytes | bytearray, int],
+        server_address: Tuple[Union[str, bytes, bytearray], int],
         bind_and_activate: bool = True,
         server_type: ServerType = "redis",
         server_version: VersionType = (8, 0),
@@ -126,7 +128,7 @@ def __init__(
         self.allow_reuse_address = True
         self.fake_server = FakeServer(server_type=server_type, version=server_version)
         self.client_ids = count(0)
-        self.clients: Dict[int, FakeRedis] = dict()
+        self.clients: Dict[int, Client] = dict()
 
 
 if __name__ == "__main__":

test/test_tcp_server/test_connectivity.py

@@ -1,14 +1,11 @@
-import sys
 import time
 from threading import Thread
 
-import pytest
 import redis
 
 from fakeredis import TcpFakeServer
 
 
-@pytest.mark.skipif(sys.version_info < (3, 11), reason="TcpFakeServer is only available in Python 3.11+")
 def test_tcp_server_started():
     server_address = ("127.0.0.1", 19000)
     server = TcpFakeServer(server_address)