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.

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

Jump to bottom

Call PyErr_Clear() instead of PyErr_Restore() in py_get_attr_impl(silent = TRUE) #1560

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Call PyErr_Clear() instead of PyErr_Restore() in py_get_attr_impl(silent = TRUE) #1560

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97b0300
Call `PyErr_Clear()` instead of `PyErr_Restore()` in `py_get_attr_imp…
t-kalinowski Mar 26, 2024
0ae66bd
Merge branch 'main' into windows-strict-build-workaround
t-kalinowski Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/python.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2763,21 +2763,16 @@ PyObjectRef py_get_attr_impl(PyObjectRef x,
{

ensure_python_initialized();
PyObject *attr;

if (silent) {
PyErrorScopeGuard _g;
PyObject *attr = PyObject_GetAttrString(x, key.c_str()); // new ref

attr = PyObject_GetAttrString(x, key.c_str());
if (attr == NULL)
if (attr == NULL) {
if (silent) {
PyErr_Clear();
return PyObjectRef(R_NilValue, false);

} else {

attr = PyObject_GetAttrString(x, key.c_str());
if (attr == NULL)
} else {
throw PythonException(py_fetch_error());

}
}

return py_ref(attr, x.convert());
Expand Down