Skip to content

gh-111789: Use PyDict_GetItemRef() in Objects/ #111827

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
serhiy-storchaka merged 7 commits into from
Nov 14, 2023
Merged

gh-111789: Use PyDict_GetItemRef() in Objects/ #111827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76725d7
gh-111789: Use PyDict_GetItemRef() in Objects/
serhiy-storchaka Nov 7, 2023
0a529d3
Apply suggestions from code review
serhiy-storchaka Nov 13, 2023
0b60af3
Merge branch 'main' into use-dict_getitemref2
serhiy-storchaka Nov 13, 2023
2e6a25c
Apply suggestions from code review
serhiy-storchaka Nov 13, 2023
ac62732
Apply suggestions from code review
serhiy-storchaka Nov 13, 2023
2f6044c
Merge branch 'main' into use-dict_getitemref2
serhiy-storchaka Nov 13, 2023
8efabd7
Update Objects/typeobject.c
serhiy-storchaka Nov 13, 2023
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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Victor Stinner <vstinner@python.org>
  • Loading branch information
@serhiy-storchaka @vstinner
serhiy-storchaka and vstinner authored Nov 13, 2023
commit 2e6a25cec18df37baecf1c81675c49b7d7f6bc86
1 change: 0 additions & 1 deletion Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,6 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name,
}
if (dict != NULL) {
Py_INCREF(dict);
res = PyDict_GetItemWithError(dict, name);
int rc = PyDict_GetItemRef(dict, name, &res);
Py_DECREF(dict);
if (res != NULL) {
Expand Down
10 changes: 6 additions & 4 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,9 +1432,11 @@ type_get_doc(PyTypeObject *type, void *context)
if (PyDict_GetItemRef(dict, &_Py_ID(__doc__), &result) == 0) {
result = Py_NewRef(Py_None);
}
else if (result && Py_TYPE(result)->tp_descr_get) {
Py_SETREF(result, Py_TYPE(result)->tp_descr_get(result, NULL,
(PyObject *)type));
else if (result) {
descrgetfunc descr_get = Py_TYPE(result)->tp_descr_get;
if (descr_get) {
Py_SETREF(result, descr_get(result, NULL, (PyObject *)type));
}
}
return result;
}
Expand Down Expand Up @@ -1523,7 +1525,7 @@ type_get_type_params(PyTypeObject *type, void *context)
{
PyObject *params;
if (PyDict_GetItemRef(lookup_tp_dict(type), &_Py_ID(__type_params__), &params) == 0) {
params = PyTuple_New(0);
return PyTuple_New(0);
Comment thread
serhiy-storchaka marked this conversation as resolved.
Outdated
}
return params;
}
Expand Down