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-breakpoint.c | |
| parent | edae3fd6600f10f9e16dc017b705959f541ed19a (diff) | |
| download | binutils-5aee45879681a7a76754a25b3f4f96b4529f7ae3.zip binutils-5aee45879681a7a76754a25b3f4f96b4529f7ae3.tar.gz binutils-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-breakpoint.c')
| -rw-r--r-- | gdb/python/py-breakpoint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 2fc2037..5891c3a 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -224,7 +224,7 @@ bppy_set_thread (PyObject *self, PyObject *newvalue, void *closure) _("Cannot delete `thread' attribute.")); return -1; } - else if (PyInt_Check (newvalue)) + else if (PyLong_Check (newvalue)) { if (! gdb_py_int_as_long (newvalue, &id)) return -1; @@ -266,7 +266,7 @@ bppy_set_task (PyObject *self, PyObject *newvalue, void *closure) _("Cannot delete `task' attribute.")); return -1; } - else if (PyInt_Check (newvalue)) + else if (PyLong_Check (newvalue)) { if (! gdb_py_int_as_long (newvalue, &id)) return -1; @@ -341,7 +341,7 @@ bppy_set_ignore_count (PyObject *self, PyObject *newvalue, void *closure) _("Cannot delete `ignore_count' attribute.")); return -1; } - else if (! PyInt_Check (newvalue)) + else if (!PyLong_Check (newvalue)) { PyErr_SetString (PyExc_TypeError, _("The value of `ignore_count' must be an integer.")); @@ -780,9 +780,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) if (lineobj != NULL) { - if (PyInt_Check (lineobj)) - line = xstrprintf ("%ld", PyInt_AsLong (lineobj)); - else if (PyString_Check (lineobj)) + if (PyLong_Check (lineobj)) + line = xstrprintf ("%ld", PyLong_AsLong (lineobj)); + else if (PyUnicode_Check (lineobj)) line = python_string_to_host_string (lineobj); else { |