mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-19 14:37:21 +00:00
Code Issues Releases Wiki Activity

python-c-ext: Remove Python 2 support.

Browse Source 
Since Python 2 is not supported anymore, remove Python 2 support from C
extension too

Fixes: 1ca0323e7c ("Require Python 3 and remove support for Python 2.")
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Timothy Redaelli
2022-07-18 12:40:01 +02:00
committed by Ilya Maximets
parent 2f4eb2d8c8
commit 54ebc235ae
1 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
python/ovs/_json.c
View File

@@ -2,10 +2,6 @@
#include <openvswitch/json.h> #include <openvswitch/json.h>
#include "structmember.h" #include "structmember.h"
#if PY_MAJOR_VERSION >= 3
#define IS_PY3K
#endif
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct json_parser *_parser; struct json_parser *_parser;
@@ -63,21 +59,13 @@ Parser_feed(json_ParserObject * self, PyObject * args)
if (!PyArg_UnpackTuple(args, "input", 1, 1, &input)) { if (!PyArg_UnpackTuple(args, "input", 1, 1, &input)) {
return NULL; return NULL;
} }
#ifdef IS_PY3K
if ((input_str = PyUnicode_AsUTF8AndSize(input, &input_sz)) == NULL) { if ((input_str = PyUnicode_AsUTF8AndSize(input, &input_sz)) == NULL) {
#else
if (PyString_AsStringAndSize(input, &input_str, &input_sz) < 0) {
#endif
return NULL; return NULL;
} }
rd = json_parser_feed(self->_parser, input_str, (size_t) input_sz); rd = json_parser_feed(self->_parser, input_str, (size_t) input_sz);
#ifdef IS_PY3K
return PyLong_FromSize_t(rd); return PyLong_FromSize_t(rd);
#else
return PyInt_FromSize_t(rd);
#endif
} }
static PyObject * static PyObject *
@@ -144,11 +132,7 @@ json_to_python(struct json *json)
return PyFloat_FromDouble(json->real); return PyFloat_FromDouble(json->real);
} /* fall through to treat 0 as int */ } /* fall through to treat 0 as int */
case JSON_INTEGER: case JSON_INTEGER:
#ifdef IS_PY3K
return PyLong_FromLong((long) json->integer); return PyLong_FromLong((long) json->integer);
#else
return PyInt_FromLong((long) json->integer);
#endif
case JSON_STRING: case JSON_STRING:
return PyUnicode_FromString(json->string); return PyUnicode_FromString(json->string);
@@ -225,7 +209,6 @@ static PyTypeObject json_ParserType = {
Parser_new, /* tp_new */ Parser_new, /* tp_new */
}; };
#ifdef IS_PY3K
static struct PyModuleDef moduledef = { static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
"ovs._json", /* m_name */ "ovs._json", /* m_name */
@@ -238,32 +221,17 @@ static struct PyModuleDef moduledef = {
0, /* m_free */ 0, /* m_free */
}; };
#define INITERROR return NULL
#else /* !IS_PY3K */
#define INITERROR return
#endif
PyMODINIT_FUNC PyMODINIT_FUNC
#ifdef IS_PY3K
PyInit__json(void) PyInit__json(void)
#else
init_json(void)
#endif
{ {
PyObject *m; PyObject *m;
if (PyType_Ready(&json_ParserType) < 0) { if (PyType_Ready(&json_ParserType) < 0) {
INITERROR; return NULL;
} }
#ifdef IS_PY3K
m = PyModule_Create(&moduledef); m = PyModule_Create(&moduledef);
#else
m = Py_InitModule3("ovs._json", NULL, "OVS JSON Parser module");
#endif
Py_INCREF(&json_ParserType); Py_INCREF(&json_ParserType);
PyModule_AddObject(m, "Parser", (PyObject *) & json_ParserType); PyModule_AddObject(m, "Parser", (PyObject *) & json_ParserType);
#ifdef IS_PY3K
return m; return m;
#endif
} }