Use gdbpy_convert_exception in a few more spots

I noticed a few places were converting a gdb exception to a Python
exception "by hand".  It's better to use the existing
gdbpy_convert_exception helper function, as this handles memory errors
correctly, and in the future may be enhanced in other ways.

gdb/ChangeLog
2018-12-27  Tom Tromey  <tom@tromey.com>

	* python/py-value.c (convert_value_from_python): Use
	gdbpy_convert_exception.
	* python/py-param.c (parmpy_init): Use gdbpy_convert_exception.
	* python/py-cmd.c (cmdpy_init): Use gdbpy_convert_exception.
	* python/py-breakpoint.c (bppy_init): Use
	gdbpy_convert_exception.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d1b1ab7d1670168430aa8d732595d010ada3da0..15c59b2de96369fbce7e57a39d8a8ae653d10e13 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-27  Tom Tromey  <tom@tromey.com>
+
+       * python/py-value.c (convert_value_from_python): Use
+       gdbpy_convert_exception.
+       * python/py-param.c (parmpy_init): Use gdbpy_convert_exception.
+       * python/py-cmd.c (cmdpy_init): Use gdbpy_convert_exception.
+       * python/py-breakpoint.c (bppy_init): Use
+       gdbpy_convert_exception.
+
 2018-12-27  Tom Tromey  <tom@tromey.com>
 
        * configure.nat (NATDEPFILES): Use nat/ prefix.

diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index d144bcf2e6f4c55f528dc8e3109ec458bd2143dc..29f67615548c00dd7d88445ed3d8e662f1792395 100644 (file)
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -874,9 +874,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
   CATCH (except, RETURN_MASK_ALL)
     {
       bppy_pending_object = NULL;
-      PyErr_Format (except.reason == RETURN_QUIT
-                   ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-                   "%s", except.message);
+      gdbpy_convert_exception (except);
       return -1;
     }
   END_CATCH

diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index 0e39730a4c012ec4a303738d1b1253710d01162c..8fca90efe2a02d3d64fb94f78287e7de1a39cdc1 100644 (file)
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -579,9 +579,7 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kw)
       xfree (docstring);
       xfree (pfx_name);
       Py_DECREF (self);
-      PyErr_Format (except.reason == RETURN_QUIT
-                   ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-                   "%s", except.message);
+      gdbpy_convert_exception (except);
       return -1;
     }
   END_CATCH

diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index bff5d60fc26cb8e1742600323f57f52909f79649..f8b151f09841996194d2a8998ce628e10cf44803 100644 (file)
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -738,9 +738,7 @@ parmpy_init (PyObject *self, PyObject *args, PyObject *kwds)
     {
       xfree (cmd_name);
       Py_DECREF (self);
-      PyErr_Format (except.reason == RETURN_QUIT
-                   ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-                   "%s", except.message);
+      gdbpy_convert_exception (except);
       return -1;
     }
   END_CATCH

diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index d21c2faf64a21e26aa72764460cc0c1ec390b00e..430415b2f9b764e65b280f9cb30f3860b9abd6bd 100644 (file)
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -1732,9 +1732,7 @@ convert_value_from_python (PyObject *obj)
     }
   CATCH (except, RETURN_MASK_ALL)
     {
-      PyErr_Format (except.reason == RETURN_QUIT
-                   ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-                   "%s", except.message);
+      gdbpy_convert_exception (except);
       return NULL;
     }
   END_CATCH