[pygobject] pygi_error_marshal_from_py: use new converters

[Christoph Reiter <creiter src gnome org>]

commit 7d8f8e86e9961f5ca3e777f31a40ec257747e51e
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Wed Apr 4 11:14:28 2018 +0200

    pygi_error_marshal_from_py: use new converters

 gi/pygi-error.c              | 27 +++++++++++++++++++++------
 tests/test_overrides_glib.py | 11 ++++++++---
 2 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/gi/pygi-error.c b/gi/pygi-error.c
index 8fda0156..c7780505 100644
--- a/gi/pygi-error.c
+++ b/gi/pygi-error.c
@@ -24,6 +24,7 @@
 #include "pygi-type.h"
 #include "pygi-python-compat.h"
 #include "pygi-util.h"
+#include "pygi-basictype.h"
 
 
 PyObject *PyGError = NULL;
@@ -121,6 +122,9 @@ pygi_error_check (GError **error)
 gboolean
 pygi_error_marshal_from_py (PyObject *pyerr, GError **error)
 {
+    gint code;
+    gchar *message = NULL;
+    gchar *domain = NULL;
     gboolean res = FALSE;
     PyObject *py_message = NULL,
              *py_domain = NULL,
@@ -133,33 +137,44 @@ pygi_error_marshal_from_py (PyObject *pyerr, GError **error)
     }
 
     py_message = PyObject_GetAttrString (pyerr, "message");
-    if (!py_message || !PYGLIB_PyUnicode_Check (py_message)) {
+    if (!py_message) {
         PyErr_SetString (PyExc_ValueError,
                          "GLib.Error instances must have a 'message' string attribute");
         goto cleanup;
     }
 
+    if (!pygi_utf8_from_py (py_message, &message))
+        goto cleanup;
+
     py_domain = PyObject_GetAttrString (pyerr, "domain");
-    if (!py_domain || !PYGLIB_PyUnicode_Check (py_domain)) {
+    if (!py_domain) {
         PyErr_SetString (PyExc_ValueError,
                          "GLib.Error instances must have a 'domain' string attribute");
         goto cleanup;
     }
 
+    if (!pygi_utf8_from_py (py_domain, &domain))
+        goto cleanup;
+
     py_code = PyObject_GetAttrString (pyerr, "code");
-    if (!py_code || !PYGLIB_PyLong_Check (py_code)) {
+    if (!py_code) {
         PyErr_SetString (PyExc_ValueError,
                          "GLib.Error instances must have a 'code' int attribute");
         goto cleanup;
     }
 
+    if (!pygi_gint_from_py (py_code, &code))
+        goto cleanup;
+
     res = TRUE;
     g_set_error_literal (error,
-                         g_quark_from_string (PYGLIB_PyUnicode_AsString (py_domain)),
-                         PYGLIB_PyLong_AsLong (py_code),
-                         PYGLIB_PyUnicode_AsString (py_message));
+                         g_quark_from_string (domain),
+                         code,
+                         message);
 
 cleanup:
+    g_free (message);
+    g_free (domain);
     Py_XDECREF (py_message);
     Py_XDECREF (py_code);
     Py_XDECREF (py_domain);
diff --git a/tests/test_overrides_glib.py b/tests/test_overrides_glib.py
index 9130334f..8df4b41a 100644
--- a/tests/test_overrides_glib.py
+++ b/tests/test_overrides_glib.py
@@ -561,17 +561,22 @@ class TestGVariant(unittest.TestCase):
                                 42, source_str)
 
         gerror = GLib.Error(message=42)  # not a string
-        self.assertRaisesRegexp(ValueError, ".*must have a 'message'.*",
+        self.assertRaisesRegexp(TypeError, ".*Must be string, not int.*",
                                 GLib.Variant.parse_error_print_context,
                                 gerror, source_str)
 
         gerror = GLib.Error(domain=42)  # not a string
-        self.assertRaisesRegexp(ValueError, ".*must have a 'domain'.*",
+        self.assertRaisesRegexp(TypeError, ".*Must be string, not int.*",
                                 GLib.Variant.parse_error_print_context,
                                 gerror, source_str)
 
         gerror = GLib.Error(code='not an int')
-        self.assertRaisesRegexp(ValueError, ".*must have a 'code' int.*",
+        self.assertRaisesRegexp(TypeError, ".*Must be number, not str.*",
+                                GLib.Variant.parse_error_print_context,
+                                gerror, source_str)
+
+        gerror = GLib.Error(code=GLib.MAXUINT)
+        self.assertRaisesRegexp(OverflowError, ".*not in range.*",
                                 GLib.Variant.parse_error_print_context,
                                 gerror, source_str)