pygobject_register_class fix

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c598eab..d95845b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-30  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
+
+	* codegen/codegen.py (SourceWriter.write_class): Simplify code
+	that generates the call to pygobject_register_class; Correct the
+	fallback value of bases_str.
+
 2006-07-28  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
 
 	* gtk/gtk.override (_wrap_gtk_print_context_get_cairo_context):
diff --git a/codegen/codegen.py b/codegen/codegen.py
index f02bec5e..2ed559e7 100644
--- a/codegen/codegen.py
+++ b/codegen/codegen.py
@@ -1576,12 +1576,11 @@ class SourceWriter:
                     bases_str += ', PyObject_GetAttrString(m, "%s")' % baseobj.name
             bases_str += ')'
         else:
-            bases_str = ', NULL'
+            bases_str = 'NULL'
 
         self.fp.write(
-                indent_str + 'pygobject_register_class(d, "' + obj.c_name +
-                '", ' + obj.typecode + ', &Py' + obj.c_name +
-                '_Type, ' + bases_str + ');\n')
+                '%(indent)spygobject_register_class(d, "%(c_name)s", %(typecode)s, &Py%(c_name)s_Type, %(bases)s);\n'
+                % dict(indent=indent_str, c_name=obj.c_name, typecode=obj.typecode, bases=bases_str))
 
         if obj.has_new_constructor_api:
             self.fp.write(