[PATCH] libselinux: Replace PyString_FromString with PyUnicode_FromString for SWIG 4.5.0 compatibility
Petr Lautrbach <[email protected]>
| Newsgroups | org.kernel.vger.selinux |
|---|---|
| Message-ID | <[email protected]> |
SWIG 4.5.0 removed Python 2 C API compatibility macros (PyInt_*, PyString_*, SWIG_Python_str_*) from its runtime header pyhead.swg. These macros previously mapped deprecated Python 2 C API names to their Python 3 equivalents. Fixes: https://github.com/SELinuxProject/selinux/issues/538 Authored-by: Jitka Plesníková <[email protected]> Signed-off-by: Petr Lautrbach <[email protected]> --- libselinux/src/selinuxswig_python.i | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libselinux/src/selinuxswig_python.i b/libselinux/src/selinuxswig_python.i index 03ed296d5b85..17a2620d46f7 100644 --- a/libselinux/src/selinuxswig_python.i +++ b/libselinux/src/selinuxswig_python.i @@ -69,7 +69,7 @@ def install(src, dest): PyObject* list = PyList_New(*$2); int i; for (i = 0; i < *$2; i++) { - PyList_SetItem(list, i, PyString_FromString((*$1)[i])); + PyList_SetItem(list, i, PyUnicode_FromString((*$1)[i])); } $result = SWIG_AppendOutput($result, list); } @@ -102,7 +102,7 @@ def install(src, dest): len++; plist = PyList_New(len); for (i = 0; i < len; i++) { - PyList_SetItem(plist, i, PyString_FromString((*$1)[i])); + PyList_SetItem(plist, i, PyUnicode_FromString((*$1)[i])); } } else { plist = PyList_New(0); @@ -119,7 +119,7 @@ def install(src, dest): if (*$1) { plist = PyList_New(result); for (i = 0; i < result; i++) { - PyList_SetItem(plist, i, PyString_FromString((*$1)[i])); + PyList_SetItem(plist, i, PyUnicode_FromString((*$1)[i])); } } else { plist = PyList_New(0); -- 2.55.0