From 2c1fecd16f1cc8943455cf3d573cf441162a8969 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Sun, 27 Jul 2008 09:06:41 +0000
Subject: Add _PyUnicode_Type macro

2008-07-27  Johan Dahlin  <johan@gnome.org>

    * glib/pyglib-python-compat.h:
    Add _PyUnicode_Type macro

    * gobject/gobjectmodule.c (pyg_type_name), (pyg_type_from_name),
    (_pyg_signal_accumulator), (add_signals), (add_properties),
    (get_type_name_for_class), (pyg_signal_list_names),
    (pyg_signal_name), (pyg_signal_query), (pyg_object_new),
    (pyg_add_emission_hook), (pyg_remove_emission_hook):
    * gobject/pygboxed.c (pyg_boxed_repr):
    * gobject/pygenum.c (pyg_enum_repr), (pyg_enum_add),
    (pyg_enum_get_value_name), (pyg_enum_get_value_nick):
    * gobject/pygflags.c (pyg_flags_repr), (pyg_flags_add),
    (pyg_flags_get_first_value_name), (pyg_flags_get_first_value_nick),
    (pyg_flags_get_value_names), (pyg_flags_get_value_nicks):
    * gobject/pygobject.c (build_parameter_list), (PyGProps_getattro),
    (PyGProps_setattro), (pygobject_register_class), (pygobject_repr),
    (pygobject_init), (pygobject_get_properties),
    (pygobject_set_properties), (pygobject_connect),
    (pygobject_connect_after), (pygobject_connect_object),
    (pygobject_connect_object_after), (pygobject_emit),
    (pygobject_stop_emission), (pygobject_disconnect_by_func),
    (pygobject_handler_block_by_func),
    (pygobject_handler_unblock_by_func),
    (pygobject_object_register_types):
    * gobject/pygparamspec.c (pyg_param_spec_repr),
    (pyg_param_spec_getattr):
    * gobject/pygpointer.c (pyg_pointer_repr):
    * gobject/pygtype.c (pyg_type_wrapper_repr),
    (_wrap_g_type_wrapper__get_name), (pyg_type_from_object),
    (pyg_enum_get_value), (pyg_flags_get_value),
    (pyg_value_from_pyobject), (pyg_value_as_pyobject),
    (object_doc_descr_get), (_pyg_strv_from_gvalue),
    (_pyg_strv_to_gvalue):

    Use _PyUnicode_* macros in the gobject module


svn path=/trunk/; revision=882
---
 gobject/pygflags.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gobject/pygflags.c')

diff --git a/gobject/pygflags.c b/gobject/pygflags.c
index 57f1ccb..0085560 100644
--- a/gobject/pygflags.c
+++ b/gobject/pygflags.c
@@ -102,7 +102,7 @@ pyg_flags_repr(PyGFlags *self)
                                  g_type_name(self->gtype));
     g_free(tmp);
     
-    pyretval = PyString_FromString(retval);
+    pyretval = _PyUnicode_FromString(retval);
     g_free(retval);
   
     return pyretval;
@@ -235,7 +235,7 @@ pyg_flags_add (PyObject *   module,
     if (module) {
         PyDict_SetItemString(((PyTypeObject *)stub)->tp_dict,
                              "__module__",
-                             PyString_FromString(PyModule_GetName(module)));
+                             _PyUnicode_FromString(PyModule_GetName(module)));
     
           /* Add it to the module name space */
         PyModule_AddObject(module, (char*)typename, stub);
@@ -338,7 +338,7 @@ pyg_flags_get_first_value_name(PyGFlags *self, void *closure)
   g_assert(G_IS_FLAGS_CLASS(flags_class));
   flags_value = g_flags_get_first_value(flags_class, self->parent.ob_ival);
   if (flags_value)
-      retval = PyString_FromString(flags_value->value_name);
+      retval = _PyUnicode_FromString(flags_value->value_name);
   else {
       retval = Py_None;
       Py_INCREF(Py_None);
@@ -360,7 +360,7 @@ pyg_flags_get_first_value_nick(PyGFlags *self, void *closure)
 
   flags_value = g_flags_get_first_value(flags_class, self->parent.ob_ival);
   if (flags_value)
-      retval = PyString_FromString(flags_value->value_nick);
+      retval = _PyUnicode_FromString(flags_value->value_nick);
   else {
       retval = Py_None;
       Py_INCREF(Py_None);
@@ -383,7 +383,7 @@ pyg_flags_get_value_names(PyGFlags *self, void *closure)
   retval = PyList_New(0);
   for (i = 0; i < flags_class->n_values; i++)
       if ((self->parent.ob_ival & flags_class->values[i].value) == flags_class->values[i].value)
-	  PyList_Append(retval, PyString_FromString(flags_class->values[i].value_name));
+	  PyList_Append(retval, _PyUnicode_FromString(flags_class->values[i].value_name));
 
   g_type_class_unref(flags_class);
 
@@ -403,7 +403,7 @@ pyg_flags_get_value_nicks(PyGFlags *self, void *closure)
   retval = PyList_New(0);
   for (i = 0; i < flags_class->n_values; i++)
       if ((self->parent.ob_ival & flags_class->values[i].value) == flags_class->values[i].value)
-	  PyList_Append(retval, PyString_FromString(flags_class->values[i].value_nick));
+	  PyList_Append(retval, _PyUnicode_FromString(flags_class->values[i].value_nick));
 
   g_type_class_unref(flags_class);
 
-- 
cgit