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-connection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/python/py-connection.c') diff --git a/gdb/python/py-connection.c b/gdb/python/py-connection.c index 4cdd6ab..8466041 100644 --- a/gdb/python/py-connection.c +++ b/gdb/python/py-connection.c @@ -204,12 +204,12 @@ connpy_repr (PyObject *obj) process_stratum_target *target = self->target; if (target == nullptr) - return PyString_FromFormat ("<%s (invalid)>", Py_TYPE (obj)->tp_name); + return PyUnicode_FromFormat ("<%s (invalid)>", Py_TYPE (obj)->tp_name); - return PyString_FromFormat ("<%s num=%d, what=\"%s\">", - Py_TYPE (obj)->tp_name, - target->connection_number, - make_target_connection_string (target).c_str ()); + return PyUnicode_FromFormat ("<%s num=%d, what=\"%s\">", + Py_TYPE (obj)->tp_name, + target->connection_number, + make_target_connection_string (target).c_str ()); } /* Implementation of gdb.TargetConnection.is_valid() -> Boolean. Returns -- cgit v1.1