Skip to content

Slightly rewrite internal C API to reflect the modern dict API #1187

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.

Sign up for GitHub

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

Merged
asvetlov merged 2 commits into from
Jun 22, 2025
+17 −10
Merged

Slightly rewrite internal C API to reflect the modern dict API #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b303039
Slightly rewrite internal C API to reflect the modern dict API
asvetlov Jun 22, 2025
df551ec
Merge branch 'master' into md-api
asvetlov Jun 22, 2025
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
5 changes: 4 additions & 1 deletion multidict/_multidict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ multidict_setdefault(MultiDictObject *self, PyObject *const *args,
PyObject *key = NULL;
PyObject *_default = NULL;
bool decref_default = false;
PyObject *ret = NULL;

if (parse2("setdefault",
args,
Expand All @@ -641,7 +642,9 @@ multidict_setdefault(MultiDictObject *self, PyObject *const *args,
decref_default = true;
}
ASSERT_CONSISTENT(self, false);
PyObject *ret = md_set_default(self, key, _default);
if (md_set_default(self, key, _default, &ret) < 0) {
return NULL;
}
if (decref_default) {
Py_CLEAR(_default);
}
Expand Down
22 changes: 13 additions & 9 deletions multidict/_multilib/hashtable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ md_get_one(MultiDictObject *md, PyObject *key, PyObject **ret)
if (tmp > 0) {
Py_DECREF(identity);
*ret = Py_NewRef(entry->value);
return 0;
return 1;
} else if (tmp < 0) {
goto fail;
}
Expand Down Expand Up @@ -868,7 +868,7 @@ md_get_all(MultiDictObject *md, PyObject *key, PyObject **ret)

md_finder_cleanup(&finder);
Py_DECREF(identity);
return 0;
return ret != NULL;
fail:
md_finder_cleanup(&finder);
Py_XDECREF(identity);
Expand All @@ -877,9 +877,11 @@ md_get_all(MultiDictObject *md, PyObject *key, PyObject **ret)
return -1;
}

static inline PyObject *
md_set_default(MultiDictObject *md, PyObject *key, PyObject *value)
static inline int
md_set_default(MultiDictObject *md, PyObject *key, PyObject *value,
PyObject **result)
{
*result = NULL;
PyObject *identity = md_calc_identity(md, key);
if (identity == NULL) {
goto fail;
Expand Down Expand Up @@ -907,7 +909,8 @@ md_set_default(MultiDictObject *md, PyObject *key, PyObject *value)
if (tmp > 0) {
Py_DECREF(identity);
ASSERT_CONSISTENT(md, false);
return Py_NewRef(entry->value);
*result = Py_NewRef(entry->value);
return 1;
} else if (tmp < 0) {
goto fail;
}
Expand All @@ -919,10 +922,11 @@ md_set_default(MultiDictObject *md, PyObject *key, PyObject *value)

Py_DECREF(identity);
ASSERT_CONSISTENT(md, false);
return Py_NewRef(value);
*result = Py_NewRef(value);
return 0;
fail:
Py_XDECREF(identity);
return NULL;
return -1;
}

static inline int
Expand Down Expand Up @@ -963,7 +967,7 @@ md_pop_one(MultiDictObject *md, PyObject *key, PyObject **ret)
*ret = value;
md->version = NEXT_VERSION(md->state);
ASSERT_CONSISTENT(md, false);
return 0;
return 1;
} else if (tmp < 0) {
goto fail;
}
Expand Down Expand Up @@ -1035,7 +1039,7 @@ md_pop_all(MultiDictObject *md, PyObject *key, PyObject **ret)
*ret = lst;
Py_DECREF(identity);
ASSERT_CONSISTENT(md, false);
return 0;
return lst != NULL;
fail:
Py_XDECREF(identity);
Py_XDECREF(lst);
Expand Down
Loading