[pygobject] marshal: Fix build break on Python 2



commit b630038d9a1c8cb7e5914c77fbacbed646c154d1
Author: Colin Walters <walters verbum org>
Date:   Mon Jul 30 22:30:07 2012 -0400

    marshal: Fix build break on Python 2
    
    I *think* using this wrapper function instead is right.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=680879

 gi/pygi-marshal-from-py.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gi/pygi-marshal-from-py.c b/gi/pygi-marshal-from-py.c
index fba8154..e92a379 100644
--- a/gi/pygi-marshal-from-py.c
+++ b/gi/pygi-marshal-from-py.c
@@ -1444,7 +1444,7 @@ _pygi_marshal_from_py_interface_struct (PyGIInvokeState   *state,
                 PyErr_Format (PyExc_TypeError, "argument %s: Expected %s, but got %s.%s",
                               arg_cache->arg_name ? arg_cache->arg_name : "self",
                               iface_cache->type_name,
-                              module ? _PyUnicode_AsString(module) : "<unknown module>",
+                              module ? PYGLIB_PyUnicode_AsString(module) : "<unknown module>",
                               py_arg->ob_type->tp_name);
                 if (module)
                     Py_DECREF (module);
@@ -1502,7 +1502,7 @@ _pygi_marshal_from_py_interface_object (PyGIInvokeState   *state,
         PyErr_Format (PyExc_TypeError, "argument %s: Expected %s, but got %s.%s",
                       arg_cache->arg_name ? arg_cache->arg_name : "self",
                       ( (PyGIInterfaceCache *)arg_cache)->type_name,
-                      module ? _PyUnicode_AsString(module) : "<unknown module>",
+                      module ? PYGLIB_PyUnicode_AsString(module) : "<unknown module>",
                       py_arg->ob_type->tp_name);
         if (module)
             Py_DECREF (module);
@@ -1553,7 +1553,7 @@ gboolean _pygi_marshal_from_py_interface_instance (PyGIInvokeState   *state,
                                       "argument %s: Expected a %s, but got %s.%s",
                                       arg_cache->arg_name ? arg_cache->arg_name : "self",
                                       iface_cache->type_name,
-                                      module ? _PyUnicode_AsString(module) : "<unknown module>",
+                                      module ? PYGLIB_PyUnicode_AsString(module) : "<unknown module>",
                                       py_arg->ob_type->tp_name);
                         if (module)
                             Py_DECREF (module);
@@ -1587,7 +1587,7 @@ gboolean _pygi_marshal_from_py_interface_instance (PyGIInvokeState   *state,
                     PyErr_Format (PyExc_TypeError, "argument %s: Expected %s, but got %s.%s",
                                   arg_cache->arg_name ? arg_cache->arg_name : "self",
                                   iface_cache->type_name,
-                                  module ? _PyUnicode_AsString(module) : "<unknown module>",
+                                  module ? PYGLIB_PyUnicode_AsString(module) : "<unknown module>",
                                   py_arg->ob_type->tp_name);
                     if (module)
                         Py_DECREF (module);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]