bindings: python: use PyImport_ImportModuleAttrString when available

vfazio · vfazio · commit e94715ab4e26 · 2026-04-08T19:21:58.000-05:00
Commit 035ad74 introduced Py_gpiod_GetModuleAttrString as a copy of an internal function used by CPython to get module attributes. CPython 3.14 added PyImport_ImportModuleAttrString to the public API which allows us to use the standard function when available. [0]: python/cpython#128912 Signed-off-by: Vincent Fazio <vfazio@gmail.com>
diff --git a/bindings/python/gpiod/ext/common.c b/bindings/python/gpiod/ext/common.c
@@ -64,6 +64,7 @@ PyObject *Py_gpiod_SetErrFromErrno(void)
 	return PyErr_SetFromErrno(exc);
 }
 
+#if PY_VERSION_HEX < 0x030E0000
 PyObject *Py_gpiod_GetModuleAttrString(const char *modname,
 				       const char *attrname)
 {
@@ -78,6 +79,7 @@ PyObject *Py_gpiod_GetModuleAttrString(const char *modname,
 
 	return attribute;
 }
+#endif
 
 unsigned int Py_gpiod_PyLongAsUnsignedInt(PyObject *pylong)
 {
diff --git a/bindings/python/gpiod/ext/internal.h b/bindings/python/gpiod/ext/internal.h
@@ -8,8 +8,12 @@
 #include <Python.h>
 
 PyObject *Py_gpiod_SetErrFromErrno(void);
+#if PY_VERSION_HEX < 0x030E0000
 PyObject *Py_gpiod_GetModuleAttrString(const char *modname,
 				       const char *attrname);
+#else
+#define Py_gpiod_GetModuleAttrString PyImport_ImportModuleAttrString
+#endif
 unsigned int Py_gpiod_PyLongAsUnsignedInt(PyObject *pylong);
 void Py_gpiod_dealloc(PyObject *self);
 PyObject *Py_gpiod_MakeRequestObject(struct gpiod_line_request *request,

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ PyObject *Py_gpiod_SetErrFromErrno(void)`
`64`	`64`	`return PyErr_SetFromErrno(exc);`
`65`	`65`	`}`
`66`	`66`
	`67`	`+#if PY_VERSION_HEX < 0x030E0000`
`67`	`68`	`PyObject Py_gpiod_GetModuleAttrString(const char modname,`
`68`	`69`	`const char *attrname)`
`69`	`70`	`{`
`@@ -78,6 +79,7 @@ PyObject Py_gpiod_GetModuleAttrString(const char modname,`
`78`	`79`
`79`	`80`	`return attribute;`
`80`	`81`	`}`
	`82`	`+#endif`
`81`	`83`
`82`	`84`	`unsigned int Py_gpiod_PyLongAsUnsignedInt(PyObject *pylong)`
`83`	`85`	`{`