diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2017-12-14 15:46:47 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2017-12-14 15:46:47 -0500 |
| commit | 8e557e52b3fd45a56fb42dbbaad3d6ece3694eb4 (patch) | |
| tree | 46bd230fc06d345edc7b9669bd0c07554836c8ff /gdb | |
| parent | 863f7a5f4811c24d9a5863ffb541ff3da1511450 (diff) | |
| download | fsf-binutils-gdb-8e557e52b3fd45a56fb42dbbaad3d6ece3694eb4.zip fsf-binutils-gdb-8e557e52b3fd45a56fb42dbbaad3d6ece3694eb4.tar.gz fsf-binutils-gdb-8e557e52b3fd45a56fb42dbbaad3d6ece3694eb4.tar.bz2 | |
py-breakpoint: Don't use the 'p' PyArg_ParseTupleAndKeywords format specifier
In Python 3, the 'p' format specifier can be passed to
PyArg_ParseTupleAndKeywords to test the argument for truth and convert
it to a boolean value (the p stands for predicate). However, it is not
available in Python 2, causing this error:
Traceback (most recent call last):
File "test.py", line 1, in <module>
b1 = gdb.Breakpoint("foo", qualified=False)
TypeError: argument 10 (impossible<bad format char>)
This patch changes it to the 'O' specifier, which returns the Python
object passed in without transformation, and uses PyObject_IsTrue on it.
This is what is done for the other boolean parameters of this function
(internal and temporary).
This fixes the test gdb.python/py-breakpoint.exp for Python 2.
gdb/ChangeLog:
* python/py-breakpoint.c (bppy_init): Use 'O' format specifier
for "qualified" and use PyObject_IsTrue.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/python/py-breakpoint.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cd9e29c..f98ec27 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-12-14 Simon Marchi <simon.marchi@ericsson.com> + + * python/py-breakpoint.c (bppy_init): Use 'O' format specifier + for "qualified" and use PyObject_IsTrue. + 2017-12-14 Jan Kratochvil <jan.kratochvil@redhat.com> * dwarf2read.c (dw2_debug_names_iterator::next): Support diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index ce680c4..05291b5 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -707,9 +707,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) char *label = NULL; char *source = NULL; char *function = NULL; - int qualified = 0; + PyObject * qualified = NULL; - if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "|siiOOsssOp", keywords, + if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "|siiOOsssOO", keywords, &spec, &type, &access_type, &internal, &temporary, &source, @@ -762,7 +762,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) { event_location_up location; symbol_name_match_type func_name_match_type - = (qualified + = (qualified != NULL && PyObject_IsTrue (qualified) ? symbol_name_match_type::FULL : symbol_name_match_type::WILD); |