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-lazy-string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/python/py-lazy-string.c') diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c index 69b1bc5..c49987e 100644 --- a/gdb/python/py-lazy-string.c +++ b/gdb/python/py-lazy-string.c @@ -73,7 +73,7 @@ stpy_get_encoding (PyObject *self, void *closure) /* An encoding can be set to NULL by the user, so check before attempting a Python FromString call. If NULL return Py_None. */ if (self_string->encoding) - result = PyString_FromString (self_string->encoding); + result = PyUnicode_FromString (self_string->encoding); else { result = Py_None; -- cgit v1.1