Skip to content

[mypyc] Replace _CPyObject_HasAttr with PyObject_HasAttrWithError #20535

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
JukkaL merged 2 commits into from
Jan 8, 2026
Merged

[mypyc] Replace _CPyObject_HasAttr with PyObject_HasAttrWithError #20535

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb8d563
[mypyc] Replace _CPyObject_HasAttr with PyObject_HasAttrWithError
cdce8p Jan 6, 2026
8d6ff03
Add explicit error check
cdce8p Jan 7, 2026
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
Add explicit error check
  • Loading branch information
@cdce8p
cdce8p committed Jan 7, 2026
commit 8d6ff033ada0a5f3c5772c8a92e9c321286f3611
4 changes: 2 additions & 2 deletions mypyc/lib-rt/dict_ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ int CPyDict_Update(PyObject *dict, PyObject *stuff) {
int CPyDict_UpdateFromAny(PyObject *dict, PyObject *stuff) {
if (PyDict_CheckExact(dict)) {
// Argh this sucks
if (PyDict_Check(stuff)|| PyObject_HasAttrWithError(stuff, mypyc_interned_str.keys)) {
if (PyDict_Check(stuff) || PyObject_HasAttrWithError(stuff, mypyc_interned_str.keys) > 0) {
return PyDict_Update(dict, stuff);
} else {
return PyDict_MergeFromSeq2(dict, stuff, 1);
Expand All @@ -178,7 +178,7 @@ PyObject *CPyDict_FromAny(PyObject *obj) {
if (!dict) {
return NULL;
}
if (PyObject_HasAttrWithError(obj, mypyc_interned_str.keys)) {
if (PyObject_HasAttrWithError(obj, mypyc_interned_str.keys) > 0) {
res = PyDict_Update(dict, obj);
} else {
res = PyDict_MergeFromSeq2(dict, obj, 1);
Expand Down