From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/10] _fireinfo: Migrate to Python 3 Date: Fri, 07 May 2021 11:16:46 +0000 Message-ID: <20210507111654.2397-3-michael.tremer@ipfire.org> In-Reply-To: <20210507111654.2397-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7435018285362077408==" List-Id: --===============7435018285362077408== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- src/_fireinfo/fireinfo.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/_fireinfo/fireinfo.c b/src/_fireinfo/fireinfo.c index 6601c21..58ee7e2 100644 --- a/src/_fireinfo/fireinfo.c +++ b/src/_fireinfo/fireinfo.c @@ -185,7 +185,7 @@ do_detect_hypervisor() { if (!hypervisor_vendor) Py_RETURN_NONE; =20 - return PyString_FromString(hypervisor_vendor); + return PyUnicode_FromString(hypervisor_vendor); } =20 Py_RETURN_NONE; @@ -215,22 +215,30 @@ do_get_harddisk_serial(PyObject *o, PyObject *args) { strncpy(serial, (const char *)hd.serial_no, sizeof(serial) - 1); =20 if (serial[0]) - return PyString_FromString(serial); + return PyUnicode_FromString(serial); } =20 Py_RETURN_NONE; } =20 -static PyMethodDef fireinfoModuleMethods[] =3D { +static PyMethodDef fireinfo_methods[] =3D { { "detect_hypervisor", (PyCFunction) do_detect_hypervisor, METH_NOARGS, NUL= L }, { "get_harddisk_serial", (PyCFunction) do_get_harddisk_serial, METH_VARARGS= , NULL }, { NULL, NULL, 0, NULL } }; =20 -void init_fireinfo(void) { - PyObject *m; +static struct PyModuleDef fireinfo_module =3D { + .m_base =3D PyModuleDef_HEAD_INIT, + .m_name =3D "_fireinfo", + .m_size =3D -1, + .m_doc =3D "Python module for fireinfo", + .m_methods =3D fireinfo_methods, +}; + +PyMODINIT_FUNC PyInit__fireinfo(void) { + PyObject* m =3D PyModule_Create(&fireinfo_module); + if (!m) + return NULL; =20 - m =3D Py_InitModule("_fireinfo", fireinfoModuleMethods); - if (m =3D=3D NULL) - return; + return m; } --=20 2.20.1 --===============7435018285362077408==--