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-symtab.c | |
parent | edae3fd6600f10f9e16dc017b705959f541ed19a (diff) | |
download | gdb-5aee45879681a7a76754a25b3f4f96b4529f7ae3.zip gdb-5aee45879681a7a76754a25b3f4f96b4529f7ae3.tar.gz gdb-5aee45879681a7a76754a25b3f4f96b4529f7ae3.tar.bz2 |
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-symtab.c')
-rw-r--r-- | gdb/python/py-symtab.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c index cb28264..bfda599 100644 --- a/gdb/python/py-symtab.c +++ b/gdb/python/py-symtab.c @@ -93,7 +93,7 @@ stpy_str (PyObject *self) STPY_REQUIRE_VALID (self, symtab); - result = PyString_FromString (symtab_to_filename_for_display (symtab)); + result = PyUnicode_FromString (symtab_to_filename_for_display (symtab)); return result; } @@ -234,8 +234,8 @@ salpy_str (PyObject *self) filename = symtab_to_filename_for_display (symtab); } - return PyString_FromFormat ("symbol and line for %s, line %d", filename, - sal->line); + return PyUnicode_FromFormat ("symbol and line for %s, line %d", filename, + sal->line); } static void |