https://github.com/python/cpython/commit/e8e6e300544e8adab4f062589100c6263e83d8b3
commit: e8e6e300544e8adab4f062589100c6263e83d8b3
branch: 3.13
author: Malcolm Smith <sm...@chaquo.com>
committer: freakboy3742 <russ...@keith-magee.com>
date: 2025-03-18T12:53:10+08:00
summary:
[3.13] gh-118201: Simplify conv_confname (#126089) (#131375)
gh-118201: Simplify conv_confname (#126089)
(cherry picked from commit c5c9286804e38c95fe717f22ce1bf2f18eee5b17)
files:
A Misc/NEWS.d/next/Library/2024-10-28-19-49-18.gh-issue-118201.v41XXh.rst
M Lib/test/support/os_helper.py
M Lib/test/test_os.py
M Lib/test/test_posix.py
M Modules/clinic/posixmodule.c.h
M Modules/posixmodule.c
diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index 891405943b78c5..8071c248b9b67e 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -632,8 +632,7 @@ def fd_count():
if hasattr(os, 'sysconf'):
try:
MAXFD = os.sysconf("SC_OPEN_MAX")
- except (OSError, ValueError):
- # gh-118201: ValueError is raised intermittently on iOS
+ except OSError:
pass
old_modes = None
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 87e7328acab8f8..1396cbd317aacd 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -2397,8 +2397,8 @@ def test_fchown(self):
support.is_emscripten or support.is_wasi,
"musl libc issue on Emscripten/WASI, bpo-46390"
)
- @unittest.skipIf(support.is_apple_mobile, "gh-118201: Test is flaky on
iOS")
def test_fpathconf(self):
+ self.assertIn("PC_NAME_MAX", os.pathconf_names)
self.check(os.pathconf, "PC_NAME_MAX")
self.check(os.fpathconf, "PC_NAME_MAX")
self.check_bool(os.pathconf, "PC_NAME_MAX")
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index ef9d617f66feec..c9cbe1541e733e 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -568,10 +568,38 @@ def test_dup(self):
@unittest.skipUnless(hasattr(posix, 'confstr'),
'test needs posix.confstr()')
- @unittest.skipIf(support.is_apple_mobile, "gh-118201: Test is flaky on
iOS")
def test_confstr(self):
- self.assertRaises(ValueError, posix.confstr, "CS_garbage")
- self.assertEqual(len(posix.confstr("CS_PATH")) > 0, True)
+ with self.assertRaisesRegex(
+ ValueError, "unrecognized configuration name"
+ ):
+ posix.confstr("CS_garbage")
+
+ with self.assertRaisesRegex(
+ TypeError, "configuration names must be strings or integers"
+ ):
+ posix.confstr(1.23)
+
+ path = posix.confstr("CS_PATH")
+ self.assertGreater(len(path), 0)
+ self.assertEqual(posix.confstr(posix.confstr_names["CS_PATH"]), path)
+
+ @unittest.skipUnless(hasattr(posix, 'sysconf'),
+ 'test needs posix.sysconf()')
+ def test_sysconf(self):
+ with self.assertRaisesRegex(
+ ValueError, "unrecognized configuration name"
+ ):
+ posix.sysconf("SC_garbage")
+
+ with self.assertRaisesRegex(
+ TypeError, "configuration names must be strings or integers"
+ ):
+ posix.sysconf(1.23)
+
+ arg_max = posix.sysconf("SC_ARG_MAX")
+ self.assertGreater(arg_max, 0)
+ self.assertEqual(
+ posix.sysconf(posix.sysconf_names["SC_ARG_MAX"]), arg_max)
@unittest.skipUnless(hasattr(posix, 'dup2'),
'test needs posix.dup2()')
diff --git
a/Misc/NEWS.d/next/Library/2024-10-28-19-49-18.gh-issue-118201.v41XXh.rst
b/Misc/NEWS.d/next/Library/2024-10-28-19-49-18.gh-issue-118201.v41XXh.rst
new file mode 100644
index 00000000000000..bed4b3b5956f31
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-10-28-19-49-18.gh-issue-118201.v41XXh.rst
@@ -0,0 +1,2 @@
+Fixed intermittent failures of :any:`os.confstr`, :any:`os.pathconf` and
+:any:`os.sysconf` on iOS and Android.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index b69817ae9bb482..25d242dbd42699 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -9939,7 +9939,7 @@ os_fpathconf(PyObject *module, PyObject *const *args,
Py_ssize_t nargs)
if (fd < 0) {
goto exit;
}
- if (!conv_path_confname(args[1], &name)) {
+ if (!conv_confname(module, args[1], &name, "pathconf_names")) {
goto exit;
}
_return_value = os_fpathconf_impl(module, fd, name);
@@ -10013,7 +10013,7 @@ os_pathconf(PyObject *module, PyObject *const *args,
Py_ssize_t nargs, PyObject
if (!path_converter(args[0], &path)) {
goto exit;
}
- if (!conv_path_confname(args[1], &name)) {
+ if (!conv_confname(module, args[1], &name, "pathconf_names")) {
goto exit;
}
_return_value = os_pathconf_impl(module, &path, name);
@@ -10051,7 +10051,7 @@ os_confstr(PyObject *module, PyObject *arg)
PyObject *return_value = NULL;
int name;
- if (!conv_confstr_confname(arg, &name)) {
+ if (!conv_confname(module, arg, &name, "confstr_names")) {
goto exit;
}
return_value = os_confstr_impl(module, name);
@@ -10083,7 +10083,7 @@ os_sysconf(PyObject *module, PyObject *arg)
int name;
long _return_value;
- if (!conv_sysconf_confname(arg, &name)) {
+ if (!conv_confname(module, arg, &name, "sysconf_names")) {
goto exit;
}
_return_value = os_sysconf_impl(module, name);
@@ -12879,4 +12879,4 @@ os__is_inputhook_installed(PyObject *module, PyObject
*Py_UNUSED(ignored))
#ifndef OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF
#define OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF
#endif /* !defined(OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF) */
-/*[clinic end generated code: output=a75be356cd4abca5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=616483d525403f7c input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 40d0f86e6aecdd..601145e561d136 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3078,18 +3078,22 @@ class Py_off_t_return_converter(long_return_converter):
type = 'Py_off_t'
conversion_fn = 'PyLong_FromPy_off_t'
-class path_confname_converter(CConverter):
+class confname_converter(CConverter):
type="int"
- converter="conv_path_confname"
+ converter="conv_confname"
-class confstr_confname_converter(path_confname_converter):
- converter='conv_confstr_confname'
+ def converter_init(self, *, table):
+ self.table = table
-class sysconf_confname_converter(path_confname_converter):
- converter="conv_sysconf_confname"
+ def parse_arg(self, argname, displayname, *, limited_capi):
+ return self.format_code("""
+ if (!{converter}(module, {argname}, &{paramname}, "{table}")) {{{{
+ goto exit;
+ }}}}
+ """, argname=argname, converter=self.converter, table=self.table)
[python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=577cb476e5d64960]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=a6199b1618d73f53]*/
/*[clinic input]
@@ -13503,46 +13507,38 @@ struct constdef {
};
static int
-conv_confname(PyObject *arg, int *valuep, struct constdef *table,
- size_t tablesize)
+conv_confname(PyObject *module, PyObject *arg, int *valuep, const char
*tablename)
{
- if (PyLong_Check(arg)) {
- int value = PyLong_AsInt(arg);
- if (value == -1 && PyErr_Occurred())
- return 0;
- *valuep = value;
- return 1;
- }
- else {
- /* look up the value in the table using a binary search */
- size_t lo = 0;
- size_t mid;
- size_t hi = tablesize;
- int cmp;
- const char *confname;
- if (!PyUnicode_Check(arg)) {
- PyErr_SetString(PyExc_TypeError,
- "configuration names must be strings or integers");
+ if (PyUnicode_Check(arg)) {
+ PyObject *table = PyObject_GetAttrString(module, tablename);
+ if (table == NULL) {
return 0;
}
- confname = PyUnicode_AsUTF8(arg);
- if (confname == NULL)
+
+ arg = PyObject_GetItem(table, arg);
+ Py_DECREF(table);
+ if (arg == NULL) {
+ PyErr_SetString(
+ PyExc_ValueError, "unrecognized configuration name");
return 0;
- while (lo < hi) {
- mid = (lo + hi) / 2;
- cmp = strcmp(confname, table[mid].name);
- if (cmp < 0)
- hi = mid;
- else if (cmp > 0)
- lo = mid + 1;
- else {
- *valuep = table[mid].value;
- return 1;
- }
}
- PyErr_SetString(PyExc_ValueError, "unrecognized configuration name");
- return 0;
+ } else {
+ Py_INCREF(arg); // Match the Py_DECREF below.
+ }
+
+ 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 success;
}
@@ -13633,14 +13629,6 @@ static struct constdef posix_constants_pathconf[] = {
{"PC_TIMESTAMP_RESOLUTION", _PC_TIMESTAMP_RESOLUTION},
#endif
};
-
-static int
-conv_path_confname(PyObject *arg, int *valuep)
-{
- return conv_confname(arg, valuep, posix_constants_pathconf,
- sizeof(posix_constants_pathconf)
- / sizeof(struct constdef));
-}
#endif
@@ -13649,7 +13637,7 @@ conv_path_confname(PyObject *arg, int *valuep)
os.fpathconf -> long
fd: fildes
- name: path_confname
+ name: confname(table="pathconf_names")
/
Return the configuration limit name for the file descriptor fd.
@@ -13659,7 +13647,7 @@ If there is no limit, return -1.
static long
os_fpathconf_impl(PyObject *module, int fd, int name)
-/*[clinic end generated code: output=d5b7042425fc3e21 input=5b8d2471cfaae186]*/
+/*[clinic end generated code: output=d5b7042425fc3e21 input=023d44589c9ed6aa]*/
{
long limit;
@@ -13677,7 +13665,7 @@ os_fpathconf_impl(PyObject *module, int fd, int name)
/*[clinic input]
os.pathconf -> long
path: path_t(allow_fd='PATH_HAVE_FPATHCONF')
- name: path_confname
+ name: confname(table="pathconf_names")
Return the configuration limit name for the file or directory path.
@@ -13688,7 +13676,7 @@ On some platforms, path may also be specified as an
open file descriptor.
static long
os_pathconf_impl(PyObject *module, path_t *path, int name)
-/*[clinic end generated code: output=5bedee35b293a089 input=bc3e2a985af27e5e]*/
+/*[clinic end generated code: output=5bedee35b293a089 input=6f6072f57b10c787]*/
{
long limit;
@@ -13865,19 +13853,11 @@ static struct constdef posix_constants_confstr[] = {
#endif
};
-static int
-conv_confstr_confname(PyObject *arg, int *valuep)
-{
- return conv_confname(arg, valuep, posix_constants_confstr,
- sizeof(posix_constants_confstr)
- / sizeof(struct constdef));
-}
-
/*[clinic input]
os.confstr
- name: confstr_confname
+ name: confname(table="confstr_names")
/
Return a string-valued system configuration variable.
@@ -13885,7 +13865,7 @@ Return a string-valued system configuration variable.
static PyObject *
os_confstr_impl(PyObject *module, int name)
-/*[clinic end generated code: output=bfb0b1b1e49b9383 input=18fb4d0567242e65]*/
+/*[clinic end generated code: output=bfb0b1b1e49b9383 input=4c6ffca2837ec959]*/
{
PyObject *result = NULL;
char buffer[255];
@@ -14422,18 +14402,10 @@ static struct constdef posix_constants_sysconf[] = {
#endif
};
-static int
-conv_sysconf_confname(PyObject *arg, int *valuep)
-{
- return conv_confname(arg, valuep, posix_constants_sysconf,
- sizeof(posix_constants_sysconf)
- / sizeof(struct constdef));
-}
-
/*[clinic input]
os.sysconf -> long
- name: sysconf_confname
+ name: confname(table="sysconf_names")
/
Return an integer-valued system configuration variable.
@@ -14441,7 +14413,7 @@ Return an integer-valued system configuration variable.
static long
os_sysconf_impl(PyObject *module, int name)
-/*[clinic end generated code: output=3662f945fc0cc756 input=279e3430a33f29e4]*/
+/*[clinic end generated code: output=3662f945fc0cc756 input=930b8f23b5d15086]*/
{
long value;
@@ -14454,40 +14426,15 @@ os_sysconf_impl(PyObject *module, int name)
#endif /* HAVE_SYSCONF */
-/* This code is used to ensure that the tables of configuration value names
- * are in sorted order as required by conv_confname(), and also to build
- * the exported dictionaries that are used to publish information about the
- * names available on the host platform.
- *
- * Sorting the table at runtime ensures that the table is properly ordered
- * when used, even for platforms we're not able to test on. It also makes
- * it easier to add additional entries to the tables.
- */
-
-static int
-cmp_constdefs(const void *v1, const void *v2)
-{
- const struct constdef *c1 =
- (const struct constdef *) v1;
- const struct constdef *c2 =
- (const struct constdef *) v2;
-
- return strcmp(c1->name, c2->name);
-}
-
static int
setup_confname_table(struct constdef *table, size_t tablesize,
const char *tablename, PyObject *module)
{
- PyObject *d = NULL;
- size_t i;
-
- qsort(table, tablesize, sizeof(struct constdef), cmp_constdefs);
- d = PyDict_New();
+ PyObject *d = PyDict_New();
if (d == NULL)
return -1;
- for (i=0; i < tablesize; ++i) {
+ for (size_t i=0; i < tablesize; ++i) {
PyObject *o = PyLong_FromLong(table[i].value);
if (o == NULL || PyDict_SetItemString(d, table[i].name, o) == -1) {
Py_XDECREF(o);
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
