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-unwind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/python/py-unwind.c') diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index 36f42cbcac3..dd43901be21 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -213,7 +213,7 @@ unwind_infopy_str (PyObject *self) stb.puts (")"); } - return PyString_FromString (stb.c_str ()); + return PyUnicode_FromString (stb.c_str ()); } /* Create UnwindInfo instance for given PendingFrame and frame ID. @@ -349,7 +349,7 @@ pending_framepy_str (PyObject *self) const char *pc_str = NULL; if (frame == NULL) - return PyString_FromString ("Stale PendingFrame instance"); + return PyUnicode_FromString ("Stale PendingFrame instance"); try { sp_str = core_addr_to_string_nz (get_frame_sp (frame)); @@ -360,7 +360,7 @@ pending_framepy_str (PyObject *self) GDB_PY_HANDLE_EXCEPTION (except); } - return PyString_FromFormat ("SP=%s,PC=%s", sp_str, pc_str); + return PyUnicode_FromFormat ("SP=%s,PC=%s", sp_str, pc_str); } /* Implementation of gdb.PendingFrame.read_register (self, reg) -> gdb.Value. -- cgit v1.2.1