Skip to content

gh-106016: Support customizing of module attributes access with __setattr__/__delattr__ (PEP 726) #108261

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

Closed
skirpichev wants to merge 21 commits into from
Closed

gh-106016: Support customizing of module attributes access with __setattr__/__delattr__ (PEP 726) #108261

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a840465
gh-106016: Support customizing of module attributes access with __set…
skirpichev Apr 1, 2023
3e78225
Update Doc/reference/datamodel.rst
skirpichev Aug 22, 2023
0a8cec6
Update Doc/reference/datamodel.rst
skirpichev Aug 22, 2023
2904f50
Update Doc/reference/datamodel.rst
skirpichev Aug 22, 2023
bce1667
Drop PyErr_Clear()
skirpichev Aug 22, 2023
bcafd0d
move delattr/setattr declarations
skirpichev Aug 22, 2023
0740efb
m -> mod
skirpichev Aug 22, 2023
74c3d13
Check PyObject_CallFunctionObjArgs return value
skirpichev Aug 22, 2023
83c4c50
Document changes in the "Other Language Changes" section
skirpichev Aug 22, 2023
7fe6a06
Use PyDict_GetItemRef instead of PyDict_GetItemWithError
skirpichev Aug 22, 2023
47d93ce
Move test modules to Lib/test/test_module/
skirpichev Aug 22, 2023
f3f796d
Avoid ret variable
skirpichev Aug 23, 2023
f971a22
+Py_DECREF
skirpichev Aug 23, 2023
68eefbd
Reorder setattr/delattr paths
skirpichev Aug 23, 2023
048d8bf
Merge branch 'main' into module-setdelattr
skirpichev Aug 23, 2023
058412e
Apply suggestions from code review
skirpichev Aug 24, 2023
49c82c5
Update Lib/test/test_module/__init__.py
skirpichev Aug 24, 2023
280fc0e
Merge branch 'main' into module-setdelattr
skirpichev Aug 24, 2023
dafc546
Merge branch 'main' into module-setdelattr
skirpichev Oct 7, 2023
9dcacaf
Merge branch 'main' into module-setdelattr
skirpichev Feb 25, 2024
cd0e4be
Mention PEP in docs, like PEP 562
skirpichev Feb 25, 2024
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
Reorder setattr/delattr paths
  • Loading branch information
@skirpichev
skirpichev committed Aug 23, 2023
commit 68eefbdcf994f8a5c5bc0c1e09ce873b407ee957
23 changes: 11 additions & 12 deletions Objects/moduleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,30 +869,29 @@ _Py_module_getattro(PyModuleObject *m, PyObject *name)
static int
module_setattro(PyModuleObject *mod, PyObject *name, PyObject *value)
{
PyObject *res;
assert(mod->md_dict != NULL);
if (value == NULL) {
PyObject *delattr;
if (PyDict_GetItemRef(mod->md_dict, &_Py_ID(__delattr__), &delattr) < 0) {
if (value) {
PyObject *setattr;
if (PyDict_GetItemRef(mod->md_dict, &_Py_ID(__setattr__), &setattr) < 0) {
return -1;
}
if (delattr) {
res = PyObject_CallFunctionObjArgs(delattr, name, NULL);
Py_DECREF(delattr);
if (setattr) {
PyObject *res = PyObject_CallFunctionObjArgs(setattr, name, value, NULL);
Py_DECREF(setattr);
if (res == NULL) {
return -1;
}
Comment thread
skirpichev marked this conversation as resolved.
Py_DECREF(res);
return 0;
}
} else {
Comment thread
skirpichev marked this conversation as resolved.
Outdated
PyObject *setattr;
if (PyDict_GetItemRef(mod->md_dict, &_Py_ID(__setattr__), &setattr) < 0) {
PyObject *delattr;
if (PyDict_GetItemRef(mod->md_dict, &_Py_ID(__delattr__), &delattr) < 0) {
return -1;
}
if (setattr) {
res = PyObject_CallFunctionObjArgs(setattr, name, value, NULL);
Py_DECREF(setattr);
if (delattr) {
PyObject *res = PyObject_CallFunctionObjArgs(delattr, name, NULL);
Py_DECREF(delattr);
if (res == NULL) {
return -1;
}
Expand Down