diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2022-03-21 10:07:41 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2022-03-23 07:42:57 -0400 |
| commit | 5aee45879681a7a76754a25b3f4f96b4529f7ae3 (patch) | |
| tree | 04698477d38cf45871c7542eea6ce6a8d2b46a18 /gdb/python/py-unwind.c | |
| parent | edae3fd6600f10f9e16dc017b705959f541ed19a (diff) | |
| download | binutils-gdb-5aee45879681a7a76754a25b3f4f96b4529f7ae3.tar.gz | |
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
Diffstat (limited to 'gdb/python/py-unwind.c')
| -rw-r--r-- | gdb/python/py-unwind.c | 6 |
1 files changed, 3 insertions, 3 deletions
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. |