Skip to content

gh-107954, PEP 741: Add PyConfig_Get() function #123472

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
vstinner merged 18 commits into from
Sep 2, 2024
+1,466 −257
Merged

gh-107954, PEP 741: Add PyConfig_Get() function #123472

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4c79a52
gh-107954, PEP 741: Add PyConfig_Get() function
vstinner Dec 1, 2023
988dca5
Test enable_gil option
vstinner Aug 29, 2024
2d592a6
Fix make check-c-globals
vstinner Aug 29, 2024
4e0951e
Merge branch 'main' into config_get
vstinner Aug 30, 2024
edc9974
Update Doc/c-api/init_config.rst
vstinner Aug 30, 2024
4616b52
Update Doc/c-api/init_config.rst
vstinner Aug 30, 2024
135d862
Update Modules/_testcapi/config.c
vstinner Aug 30, 2024
2324465
Update Python/initconfig.c
vstinner Aug 30, 2024
0c20c8a
Update Python/initconfig.c
vstinner Aug 30, 2024
67210db
Apply suggestions from code review
vstinner Aug 30, 2024
262738f
Address Bénédikt's review
vstinner Aug 30, 2024
fcf0918
Change SPEC() macro for the visibility
vstinner Aug 30, 2024
a39857e
Complete test_config_get_sys_flags()
vstinner Sep 2, 2024
2014c52
Revert test_cmd_line.py changes
vstinner Sep 2, 2024
4a3595c
Check pos argument in sys_set_flag()
vstinner Sep 2, 2024
8c321f1
Cleanup initconfig.c
vstinner Sep 2, 2024
1556b95
Merge branch 'main' into config_get
vstinner Sep 2, 2024
b655e93
Fix sys_set_flag() assertion
vstinner Sep 2, 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
Apply suggestions from code review 
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
  • Loading branch information
@vstinner @picnixz
vstinner and picnixz authored Aug 30, 2024
commit 67210db6f79bdba98dcceb69694525276a795aa9
14 changes: 7 additions & 7 deletions Python/initconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,30 +3812,30 @@ PyConfig_Set(const char *name, PyObject *value)

case PyConfig_MEMBER_WSTR:
if (!PyUnicode_CheckExact(value)) {
PyErr_Format(PyExc_TypeError, "expect str, got %T", value);
PyErr_Format(PyExc_TypeError, "expected str, got %T", value);
return -1;
}
break;

case PyConfig_MEMBER_WSTR_OPT:
if (value != Py_None && !PyUnicode_CheckExact(value)) {
PyErr_Format(PyExc_TypeError, "expect str or None, got %T", value);
PyErr_Format(PyExc_TypeError, "expected str or None, got %T", value);
return -1;
}
break;

case PyConfig_MEMBER_WSTR_LIST:
if (strcmp(spec->name, "xoptions") != 0) {
if (!PyList_Check(value)) {
PyErr_Format(PyExc_TypeError, "expect list[str], got %T",
PyErr_Format(PyExc_TypeError, "expected list[str], got %T",
value);
return -1;
}
for (Py_ssize_t i=0; i < PyList_GET_SIZE(value); i++) {
PyObject *item = PyList_GET_ITEM(value, i);
if (!PyUnicode_Check(item)) {
PyErr_Format(PyExc_TypeError,
"expect list[str], list item %zd has type %T",
"expected str, list item %zd has type %T",
i, item);
return -1;
}
Expand All @@ -3845,7 +3845,7 @@ PyConfig_Set(const char *name, PyObject *value)
// xoptions type is dict[str, str]
if (!PyDict_Check(value)) {
PyErr_Format(PyExc_TypeError,
"expect dict[str, str | bool], got %T",
"expected dict[str, str | bool], got %T",
value);
return -1;
}
Expand All @@ -3855,13 +3855,13 @@ PyConfig_Set(const char *name, PyObject *value)
while (PyDict_Next(value, &pos, &key, &item)) {
if (!PyUnicode_Check(key)) {
PyErr_Format(PyExc_TypeError,
"expect dict[str, str | bool], "
"expected str, "
"got dict key type %T", key);
return -1;
}
if (!PyUnicode_Check(item) && !PyBool_Check(item)) {
PyErr_Format(PyExc_TypeError,
"expect dict[str, str | bool], "
"expected str or bool, "
"got dict value type %T", key);
return -1;
}
Expand Down