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-objfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/python/py-objfile.c') diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index 8c56879..3e3270e 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -510,10 +510,10 @@ objfpy_repr (PyObject *self_) objfile *obj = self->objfile; if (obj == nullptr) - return PyString_FromString (""); + return PyUnicode_FromString (""); - return PyString_FromFormat ("", - objfile_name (obj)); + return PyUnicode_FromFormat ("", + objfile_name (obj)); } /* Subroutine of gdbpy_lookup_objfile_by_build_id to simplify it. -- cgit v1.1