diff --git a/docs/about/changelog.md b/docs/about/changelog.md index b4be5779..afc7885b 100644 --- a/docs/about/changelog.md +++ b/docs/about/changelog.md @@ -12,6 +12,8 @@ toc_depth: 2 ### 🚀 Features - ACL commands support #338 +- Add support disable_decoding in async read_response #349 + ### 🧰 Maintenance diff --git a/fakeredis/aioredis.py b/fakeredis/aioredis.py index 38b047b2..031a0614 100644 --- a/fakeredis/aioredis.py +++ b/fakeredis/aioredis.py @@ -173,6 +173,8 @@ async def read_response(self, **kwargs: Any) -> Any: # type: ignore response = await self._reader.read(0) if can_read and self._reader else None if isinstance(response, redis_async.ResponseError): raise response + if kwargs.get("disable_decoding", False): + return response return self._decode(response) def repr_pieces(self) -> List[Tuple[str, Any]]: diff --git a/poetry.lock b/poetry.lock index d0bd89f1..f2f8de98 100644 --- a/poetry.lock +++ b/poetry.lock @@ -27,19 +27,19 @@ files = [ [[package]] name = "attrs" -version = "24.2.0" +version = "24.3.0" description = "Classes Without Boilerplate" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "attrs-24.2.0-py3-none-any.whl", hash = "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"}, - {file = "attrs-24.2.0.tar.gz", hash = "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346"}, + {file = "attrs-24.3.0-py3-none-any.whl", hash = "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308"}, + {file = "attrs-24.3.0.tar.gz", hash = "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff"}, ] [package.extras] benchmark = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins", "pytest-xdist[psutil]"] cov = ["cloudpickle", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] -dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] +dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit-uv", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier (<24.7)"] tests = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"] diff --git a/pyproject.toml b/pyproject.toml index 4670361a..8a646ccb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ packages = [ { include = "fakeredis" }, { include = "LICENSE", to = "fakeredis" }, ] -version = "2.26.2" +version = "2.27.0" description = "Python implementation of redis API, can be used for testing purposes." readme = "README.md" keywords = ["redis", "RedisJson", "RedisBloom", "tests", "redis-stack"] diff --git a/test/conftest.py b/test/conftest.py index b5b0282d..f0c0291e 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -115,6 +115,8 @@ async def _req_aioredis2(request) -> redis.asyncio.Redis: server_type, server_version = request.getfixturevalue("real_redis_version") if request.param != "fake" and not server_version: pytest.skip("Redis is not running") + + decode_responses = bool(request.node.get_closest_marker("decode_responses")) unsupported_server_types = request.node.get_closest_marker("unsupported_server_types") if unsupported_server_types and server_type in unsupported_server_types.args: pytest.skip(f"Server type {server_type} is not supported") @@ -131,9 +133,9 @@ async def _req_aioredis2(request) -> redis.asyncio.Redis: fake_server: Optional[fakeredis.FakeServer] if request.param == "fake": fake_server = request.getfixturevalue("fake_server") - ret = fakeredis.FakeAsyncRedis(server=fake_server, lua_modules=lua_modules) + ret = fakeredis.FakeAsyncRedis(server=fake_server, lua_modules=lua_modules, decode_responses=decode_responses) else: - ret = redis.asyncio.Redis(host="localhost", port=6390, db=2) + ret = redis.asyncio.Redis(host="localhost", port=6390, db=2, decode_responses=decode_responses) fake_server = None if not fake_server or fake_server.connected: await ret.flushall() diff --git a/test/test_asyncredis.py b/test/test_asyncredis.py index fb466e2d..8588f799 100644 --- a/test/test_asyncredis.py +++ b/test/test_asyncredis.py @@ -144,6 +144,17 @@ async def test_syntax_error(async_redis: redis.asyncio.Redis): await async_redis.execute_command("get") +@pytest.mark.decode_responses +async def test_never_decode(async_redis: redis.asyncio.Redis): + assert async_redis.connection_pool.get_encoder().decode_responses + + await async_redis.execute_command("set", "key", "some ascii") + text = await async_redis.execute_command("get", "key") + assert isinstance(text, str) + bytestr = await async_redis.execute_command("get", "key", NEVER_DECODE=True) + assert isinstance(bytestr, bytes) + + @testtools.run_test_if_lupa class TestScripts: async def test_no_script_error(self, async_redis: redis.asyncio.Redis):