From 5aee45879681a7a76754a25b3f4f96b4529f7ae3 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 21 Mar 2022 10:07:41 -0400 Subject: gdb/python: remove Python 2/3 compatibility macros New in this version: - Rebase on master, fix a few more issues that appeared. python-internal.h contains a number of macros that helped make the code work with both Python 2 and 3. Remove them and adjust the code to use the Python 3 functions. Change-Id: I99a3d80067fb2d65de4f69f6473ba6ffd16efb2d --- gdb/python/py-xmethods.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/python/py-xmethods.c') diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c index 9d58249..1467e52 100644 --- a/gdb/python/py-xmethods.c +++ b/gdb/python/py-xmethods.c @@ -103,7 +103,7 @@ invoke_match_method (PyObject *matcher, PyObject *py_obj_type, if (match_method == NULL) return NULL; - gdbpy_ref<> py_xmethod_name (PyString_FromString (xmethod_name)); + gdbpy_ref<> py_xmethod_name (PyUnicode_FromString (xmethod_name)); if (py_xmethod_name == NULL) return NULL; @@ -601,12 +601,12 @@ python_xmethod_worker::python_xmethod_worker (PyObject *py_worker, int gdbpy_initialize_xmethods (void) { - py_match_method_name = PyString_FromString (match_method_name); + py_match_method_name = PyUnicode_FromString (match_method_name); if (py_match_method_name == NULL) return -1; py_get_arg_types_method_name - = PyString_FromString (get_arg_types_method_name); + = PyUnicode_FromString (get_arg_types_method_name); if (py_get_arg_types_method_name == NULL) return -1; -- cgit v1.1