From e6ac2bad651d5b3489f77c92f28c899817369e38 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 29 May 2023 12:40:12 +0300 Subject: [PATCH 1/2] Fix JSON.MERGE Summary --- redis/commands/json/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/redis/commands/json/commands.py b/redis/commands/json/commands.py index 5da9245a95..2ea9396d46 100644 --- a/redis/commands/json/commands.py +++ b/redis/commands/json/commands.py @@ -261,7 +261,8 @@ def merge( decode_keys: Optional[bool] = False, ) -> Optional[str]: """ - Sets or updates the JSON value at a path.. + Merges a given JSON value into matching paths. Consequently, + JSON values at matching paths are updated, deleted, or expanded with new children ``decode_keys`` If set to True, the keys of ``obj`` will be decoded with utf-8. From 73e9fcb9e26713a2df3ae2c0903ac0e4f7f8868b Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 29 May 2023 14:38:54 +0300 Subject: [PATCH 2/2] linters --- redis/commands/json/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redis/commands/json/commands.py b/redis/commands/json/commands.py index 2ea9396d46..f91ef9185c 100644 --- a/redis/commands/json/commands.py +++ b/redis/commands/json/commands.py @@ -261,8 +261,8 @@ def merge( decode_keys: Optional[bool] = False, ) -> Optional[str]: """ - Merges a given JSON value into matching paths. Consequently, - JSON values at matching paths are updated, deleted, or expanded with new children + Merges a given JSON value into matching paths. Consequently, JSON values + at matching paths are updated, deleted, or expanded with new children ``decode_keys`` If set to True, the keys of ``obj`` will be decoded with utf-8.