Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return Redis sets as Python lists #189

Merged
merged 5 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hiredis/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.4.0"
__version__ = "3.0.0"
7 changes: 0 additions & 7 deletions src/reader.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ static void *tryParentize(const redisReadTask *task, PyObject *obj) {
PyDict_SetItem(parent, last_key, obj);
}
break;
case REDIS_REPLY_SET:
assert(PyAnySet_CheckExact(parent));
PySet_Add(parent, obj);
break;
default:
assert(PyList_CheckExact(parent));
PyList_SET_ITEM(parent, task->idx, obj);
Expand Down Expand Up @@ -162,9 +158,6 @@ static void *createArrayObject(const redisReadTask *task, size_t elements) {
case REDIS_REPLY_MAP:
obj = PyDict_New();
break;
case REDIS_REPLY_SET:
obj = PySet_New(NULL);
break;
default:
obj = PyList_New(elements);
}
Expand Down
6 changes: 5 additions & 1 deletion tests/test_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ def test_none(reader):

def test_set(reader):
reader.feed(b"~3\r\n+tangerine\r\n_\r\n,10.5\r\n")
assert {b"tangerine", None, 10.5} == reader.gets()
assert [b"tangerine", None, 10.5] == reader.gets()

def test_set_with_nested_dict(reader):
reader.feed(b"~2\r\n+tangerine\r\n%1\r\n+a\r\n:1\r\n")
assert [b"tangerine", {b"a": 1}] == reader.gets()

def test_dict(reader):
reader.feed(b"%2\r\n+radius\r\n,4.5\r\n+diameter\r\n:9\r\n")
Expand Down
Loading