Skip to content

gh-118201: Simplify conv_confname #126089

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
JelleZijlstra merged 6 commits into from
Nov 19, 2024
Merged

gh-118201: Simplify conv_confname #126089

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
684a31a
Simplify conv_confname
mhsmith Oct 28, 2024
1c2009c
Use Argument Clinic correctly
mhsmith Oct 28, 2024
2a3e50a
Test os.sysconf with a key that's available on WASI
mhsmith Oct 28, 2024
97bee9a
Rearrange error handling
mhsmith Nov 9, 2024
a214081
Merge branch 'main' into simplify-conv-confname
mhsmith Nov 10, 2024
8a026f1
More error handling improvements
mhsmith Nov 18, 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
More error handling improvements
  • Loading branch information
@mhsmith
mhsmith committed Nov 18, 2024
commit 8a026f13455b1f2c6bbc632ae5d3bf984aec0838
14 changes: 9 additions & 5 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13569,15 +13569,19 @@ conv_confname(PyObject *module, PyObject *arg, int *valuep, const char *tablenam
Py_INCREF(arg); // Match the Py_DECREF below.
}

if (PyLong_Check(arg)) {
*valuep = PyLong_AsInt(arg);
} else {
int success = 0;
if (!PyLong_Check(arg)) {
PyErr_SetString(PyExc_TypeError,
"configuration names must be strings or integers");
} else {
int value = PyLong_AsInt(arg);
if (!(value == -1 && PyErr_Occurred())) {
*valuep = value;
success = 1;
}
}

Py_DECREF(arg);
return !PyErr_Occurred();
return success;
}


Expand Down