len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2026-10-10 08:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pylibfdt: Replace removed SWIG Python 2 compatibility macros

Browse source 
SWIG 4.5.0 removed Python 2 compatibility macros (PyInt_*, PyString_*)
from its runtime header pyhead.swg (see commit 79f7a2b7cb7d). Replace
them with their Python 3 C API equivalents:

- PyString_FromString -> PyUnicode_FromString
- PyString_AsString -> PyBytes_AsString
- PyInt_AsLong -> PyLong_AsLong

The replacements are safe since the macros were already aliased to
these exact functions in SWIG's Python 3 code path.

Signed-off-by: Jitka Plesnikova <jplesnik@redhat.com>
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Jitka Plesnikova 2026-07-29 07:55:56 +02:00 • committed by David Gibson
parent 66e1201c37
commit 5008d1d6a3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pylibfdt/libfdt.i
View file

@ -1136,7 +1136,7 @@ typedef uint32_t fdt32_t;
PyObject *buff; PyObject *buff;
if ($1) { if ($1) {
resultobj = PyString_FromString( resultobj = PyUnicode_FromString(
fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
buff = PyByteArray_FromStringAndSize( buff = PyByteArray_FromStringAndSize(
(const char *)($1 + 1), fdt32_to_cpu($1->len)); (const char *)($1 + 1), fdt32_to_cpu($1->len));
@ -1169,13 +1169,13 @@ typedef uint32_t fdt32_t;
} }
$1 = PyBytes_AsString($input); $1 = PyBytes_AsString($input);
%#else %#else
$1 = PyString_AsString($input); /* char *str */ $1 = PyBytes_AsString($input); /* char *str */
%#endif %#endif
} }
/* typemaps used for fdt_next_node() */ /* typemaps used for fdt_next_node() */
%typemap(in, numinputs=1) int *depth (int depth) { %typemap(in, numinputs=1) int *depth (int depth) {
depth = (int) PyInt_AsLong($input); depth = (int) PyLong_AsLong($input);
$1 = &depth; $1 = &depth;
} }