Merge branch 'master' into dragonfly-tests

Author: cunla

.github/workflows/test.yml

@@ -34,29 +34,29 @@ jobs:
           - "valkey/valkey:8.1.3"
           - "redis:6.2.17"
         python-version: ["3.9", "3.12", "3.13", "3.14"]
-        redis-py: ["4.6.0", "5.3.1", "6.4.0", "7.1.0"]
+        redis-py: ["4.6.0", "5.3.1", "6.4.0", "7.2.0"]
         install-extras: [false]
         coverage: [false]
         exclude:
           - python-version: "3.9"
-            redis-py: "7.1.0"
+            redis-py: "7.2.0"
           - python-version: "3.13"
             redis-image: "redis:8.4.0"
-            redis-py: "7.1.0"
+            redis-py: "7.2.0"
             install-extras: false
             coverage: false
         include:
           - python-version: "3.13"
             redis-image: "redis/redis-stack-server:6.2.6-v20"
-            redis-py: "7.1.0"
+            redis-py: "7.2.0"
             install-extras: true
           - python-version: "3.13"
             redis-image: "redis/redis-stack-server:7.4.0-v3"
-            redis-py: "7.1.0"
+            redis-py: "7.2.0"
             install-extras: true
           - python-version: "3.13"
             redis-image: "redis:8.4.0"
-            redis-py: "7.1.0"
+            redis-py: "7.2.0"
             install-extras: true
             coverage: true
     permissions:

docs/about/changelog.md

@@ -7,6 +7,13 @@ tags:
 toc_depth: 2
 ---
 
+## v2.34.1
+
+### 🐛 Bug Fixes
+
+- Fix handling of deprecated arguments in `FakeRedis` to support redis-py 7.2.0 #457
+- Blocking `XREAD` with `block=0` works as expected #453
+
 ## v2.34.0
 
 ### 🚀 Features

fakeredis/_connection.py

@@ -5,7 +5,7 @@
 import redis
 
 from fakeredis._fakesocket import FakeSocket
-from fakeredis._helpers import FakeSelector, convert_args_to_redis_init_kwargs
+from fakeredis._helpers import FakeSelector, convert_args_kwargs
 from . import _msgs as msgs
 from ._server import FakeBaseConnectionMixin, FakeServer
 from ._typing import Self, lib_version, RaiseErrorTypes, VersionType, ServerType
@@ -110,7 +110,7 @@ def __init__(
         :param lua_modules: A set of Lua modules to load.
         :param client_class: The Redis client class to use, e.g., redis.Redis or valkey.Valkey.
         """
-        kwds = convert_args_to_redis_init_kwargs(client_class, *args, **kwargs)
+        kwds = convert_args_kwargs(client_class, *args, **kwargs)
         kwds["server"] = server
         if not kwds.get("connection_pool", None):
             charset = kwds.get("charset", None)
@@ -154,9 +154,13 @@ def __init__(
         kwds.pop("version", None)
         kwds.pop("server_type", None)
         kwds.pop("lua_modules", None)
-        if "lib_name" in kwds and "lib_version" in kwds:
+        if "lib_name" in kwds and "lib_version" in kwds and "driver_info" not in kwds:
             kwds["lib_name"] = "fakeredis"
             kwds["lib_version"] = lib_version
+        if "driver_info" in kwds:
+            from redis import DriverInfo
+
+            kwds["driver_info"] = DriverInfo(name="fakeredis", lib_version=lib_version)
         super().__init__(**kwds)
 
     @classmethod

fakeredis/_helpers.py

@@ -7,8 +7,6 @@
 from collections import defaultdict
 from typing import Any, Set, Callable, Dict, Optional, Iterator, AnyStr, Type, MutableMapping
 
-import redis
-
 
 class SimpleString:
     def __init__(self, value: bytes) -> None:
@@ -261,21 +259,24 @@ def check_is_ready_for_command(_: Any) -> bool:
         return True
 
 
-def _get_args_to_warn() -> Set[str]:
-    closure = redis.Redis.__init__.__closure__
+def _get_args_to_warn(method: Callable) -> Set[str]:
+    closure = method.__closure__
     if closure is None:
         return set()
+    res = set()
     for cell in closure:
         value = cell.cell_contents
         if isinstance(value, list) and len(value) > 0:
-            return set(value)
-    return set()
+            res.update(value)
+        elif callable(value):
+            res.update(_get_args_to_warn(value))
+    return res
 
 
-def convert_args_to_redis_init_kwargs(redis_class: Type[redis.Redis], *args: Any, **kwargs: Any) -> Dict[str, Any]:
+def convert_args_kwargs(klass: Type[object], *args: Any, **kwargs: Any) -> Dict[str, Any]:
     """Interpret the positional and keyword arguments according to the version of redis in use"""
-    parameters = list(inspect.signature(redis_class.__init__).parameters.values())[1:]
-    args_to_warn = _get_args_to_warn()
+    parameters = list(inspect.signature(klass.__init__).parameters.values())[1:]
+    args_to_warn = _get_args_to_warn(klass.__init__)
     # Convert args => kwargs
     kwargs.update({parameters[i].name: args[i] for i in range(len(args))})
     kwargs.setdefault("host", uuid.uuid4().hex)

fakeredis/_server.py

@@ -3,7 +3,7 @@
 import time
 import weakref
 from collections import defaultdict
-from typing import Dict, Tuple, Any, List, Optional, Union
+from typing import Dict, Tuple, Any, List, Optional, Union, Set, Type
 
 import redis
 
@@ -85,18 +85,32 @@ def get_server(key: str, version: VersionType, server_type: ServerType) -> "Fake
 
 class FakeBaseConnectionMixin(object):
     def __init__(
-        self, *args: Any, version: VersionType = (7, 0), server_type: ServerType = "redis", **kwargs: Any
+        self,
+        *args: Any,
+        version: VersionType = (7, 0),
+        server_type: ServerType = "redis",
+        server: Optional[FakeServer] = None,
+        client_class: Type[redis.Redis] = redis.Redis,
+        lua_modules: Optional[Set[str]] = None,
+        writer=None,
+        connected: bool = True,
+        path: Optional[str] = None,
+        **kwargs: Any,
     ) -> None:
+        """
+        Initializes the class and sets up the required attributes and configurations for the server and client interaction.
+
+        """
         self.client_name: Optional[str] = None
         self.server_key: str
         self._sock = None
         self._selector: Optional[FakeSelector] = None
-        self._server = kwargs.pop("server", None)
-        self._client_class = kwargs.pop("client_class", redis.Redis)
-        self._lua_modules = kwargs.pop("lua_modules", set())
-        self._writer = kwargs.pop("writer", None)
-        path = kwargs.pop("path", None)
-        connected = kwargs.pop("connected", True)
+        self._server = server
+        self._client_class = client_class
+        self._lua_modules = lua_modules
+        self._writer = writer
+        path = path
+        connected = connected
         if self._server is None:
             if path:
                 self.server_key = path

fakeredis/aioredis.py

@@ -11,7 +11,7 @@
 from . import _fakesocket
 from . import _helpers
 from . import _msgs as msgs
-from ._helpers import SimpleError, convert_args_to_redis_init_kwargs
+from ._helpers import SimpleError, convert_args_kwargs
 from ._server import FakeBaseConnectionMixin, VersionType, FakeServer, ServerType
 from ._typing import async_timeout, lib_version, Self, RaiseErrorTypes
 
@@ -208,7 +208,7 @@ def __init__(
         client_class=redis_async.Redis,
         **kwargs: Any,
     ) -> None:
-        kwds = convert_args_to_redis_init_kwargs(client_class, *args, **kwargs)
+        kwds = convert_args_kwargs(client_class, *args, **kwargs)
         kwds["server"] = server
         kwds["connected"] = kwargs.get("connected", True)
         if not kwds.get("connection_pool", None):

fakeredis/commands_mixins/streams_mixin.py

@@ -80,20 +80,7 @@ def xrevrange(self, key: CommandItem, _min: StreamRangeTest, _max: StreamRangeTe
 
     @command(name="XREAD", fixed=(bytes,), repeat=(bytes,), flags=msgs.FLAG_SKIP_CONVERT_TO_RESP2)
     def xread(self, *args: bytes) -> Optional[Dict[str, Any]]:
-        (
-            (
-                count,
-                timeout,
-            ),
-            left_args,
-        ) = extract_args(
-            args,
-            (
-                "+count",
-                "+block",
-            ),
-            error_on_unexpected=False,
-        )
+        ((count, timeout), left_args) = extract_args(args, ("+count", "+block"), error_on_unexpected=False)
         if len(left_args) < 3 or not casematch(left_args[0], b"STREAMS") or len(left_args) % 2 != 1:
             raise SimpleError(msgs.SYNTAX_ERROR_MSG)
         left_args = left_args[1:]
@@ -370,8 +357,8 @@ def _xread(
             if len(stream_results) > 0:
                 res[item.key] = stream_results
 
-        # On blocking read, when count is not None, and there are no results, return None (instead of an empty list)
-        if blocking and count and len(res) == 0:
+        # On blocking read, and there are no results, return None (instead of an empty list)
+        if blocking and len(res) == 0:
             return None
         if self._client_info.protocol_version == 2:
             return [[k, v] for k, v in res.items()]

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fakeredis"
-version = "2.34.0"
+version = "2.34.1"
 description = "Python implementation of redis API, can be used for testing purposes."
 authors = [
     { name = "Daniel Moran", email = "daniel@moransoftware.ca" },
@@ -37,12 +37,13 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
     "redis>=4 ; python_version < '3.8'",
-    "redis>=4.3 ; python_version > '3.8'",
-    "redis<7.1.0 ; python_version < '3.10'",
+    "redis>=4.3; python_version > '3.8'",
+    "redis<7.2 ; python_version < '3.10'",
     "sortedcontainers>=2",
     "typing-extensions~=4.7 ; python_version < '3.11'",
 ]
@@ -66,7 +67,7 @@ Funding = "https://github.com/sponsors/cunla"
 
 [dependency-groups]
 dev = [
-    "ruff>=0.14",
+    "ruff>=0.15",
     "mypy>=1.15 ; python_version >= '3.10'",
     "pre-commit>=4.2 ; python_version >= '3.10'",
 ]

test/test_internals/test_init_args.py

@@ -14,7 +14,19 @@ def test_deprecated_args_show_warnings_for_retry_on_timeout(warn_mock: mock.Magi
     warn_mock.assert_called_once_with(
         "Call to '__init__' function with deprecated usage of input argument/s 'retry_on_timeout'. (TimeoutError is included by default.) -- Deprecated since version 6.0.0.",
         category=DeprecationWarning,
-        stacklevel=3,
+        stacklevel=mock.ANY,
+    )
+
+
+@pytest.mark.fake
+@run_test_if_redispy_ver("gte", "7.2")
+@mock.patch("warnings.warn")
+def test_deprecated_args_show_warnings_for_lib_name(warn_mock: mock.MagicMock):
+    fakeredis.FakeStrictRedis(host="localhost", port=6390, db=0, lib_name="SDSS")
+    warn_mock.assert_called_once_with(
+        "Call to '__init__' function with deprecated usage of input argument/s 'lib_name'. (Use 'driver_info' parameter instead. lib_name and lib_version will be removed in a future version.)",
+        category=DeprecationWarning,
+        stacklevel=mock.ANY,
     )