diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-19 18:46:14 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-23 09:09:40 -0400 |
| commit | ff3c2189ddbd17fb0a333bc8f9e23a2b8481ee61 (patch) | |
| tree | 3488dac47ed71afd9f8510fd5653969295130a20 | |
| parent | 00034f92c6df10876082e387347911817baeb69f (diff) | |
| download | trace-cmd-ff3c2189ddbd17fb0a333bc8f9e23a2b8481ee61.tar.gz | |
trace-cmd: Replace PySting_FromString() with PyUnicode_FromString()
Python 3 has deprecated PyString_FromString(), but both Python 2 and
Python 3 have PyUnicode_FromString() which should be equivalent (at least
according to google). As Python 2 is going to be EOL soon, we need to
support Python 3.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204231
Link: http://lore.kernel.org/linux-trace-devel/20190719225030.187908166@goodmis.org
Reported-by: Troy Engel <troyengel@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | python/ctracecmd.i | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python/ctracecmd.i b/python/ctracecmd.i index 65a3d514..09d1d641 100644 --- a/python/ctracecmd.i +++ b/python/ctracecmd.i @@ -108,7 +108,7 @@ static PyObject *py_field_get_stack(struct tep_handle *pevent, ((int)addr == -1)) break; func = tep_find_function(event->tep, addr); - if (PyList_Append(list, PyString_FromString(func))) { + if (PyList_Append(list, PyUnicode_FromString(func))) { Py_DECREF(list); return NULL; } @@ -162,10 +162,10 @@ static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record */ offset = val & 0xffff; - return PyString_FromString((char *)r->data + offset); + return PyUnicode_FromString((char *)r->data + offset); } - return PyString_FromStringAndSize((char *)r->data + f->offset, + return PyUnicode_FromStringAndSize((char *)r->data + f->offset, strnlen((char *)r->data + f->offset, f->size)); } @@ -177,7 +177,7 @@ static PyObject *py_format_get_keys(struct tep_event *ef) list = PyList_New(0); for (f = ef->format.fields; f; f = f->next) { - if (PyList_Append(list, PyString_FromString(f->name))) { + if (PyList_Append(list, PyUnicode_FromString(f->name))) { Py_DECREF(list); return NULL; } |