espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-02 12:37:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb/python: remove Python 2/3 compatibility macros

Browse Source 
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
This commit is contained in:
Simon Marchi
2022-03-21 10:07:41 -04:00
parent edae3fd660
commit 5aee458796
25 changed files with 93 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/python/py-micmd.c
View File

@ -185,7 +185,7 @@ static gdb::unique_xmalloc_ptr<char>
py_object_to_mi_key (PyObject *key_obj)
{
/* The key must be a string. */
if (!PyString_Check (key_obj))
if (!PyUnicode_Check (key_obj))
{
gdbpy_ref<> key_repr (PyObject_Repr (key_obj));
gdb::unique_xmalloc_ptr<char> key_repr_string;
@ -261,7 +261,7 @@ serialize_mi_result_1 (PyObject *result, const char *field_name)
serialize_mi_result_1 (value, key_string.get ());
}
}
else if (PySequence_Check (result) && !PyString_Check (result))
else if (PySequence_Check (result) && !PyUnicode_Check (result))
{
ui_out_emit_list list_emitter (uiout, field_name);
Py_ssize_t len = PySequence_Size (result);
@ -607,7 +607,7 @@ gdbpy_initialize_micommands ()
< 0)
return -1;
invoke_cst = PyString_FromString ("invoke");
invoke_cst = PyUnicode_FromString ("invoke");
if (invoke_cst == nullptr)
return -1;
@ -636,7 +636,7 @@ micmdpy_get_name (PyObject *self, void *closure)
gdb_assert (micmd_obj->mi_command_name != nullptr);
std::string name_str = string_printf ("-%s", micmd_obj->mi_command_name);
return PyString_FromString (name_str.c_str ());
return PyUnicode_FromString (name_str.c_str ());
}
/* Get the gdb.MICommand.installed property. Returns true if this MI