python3 port

Author: Jurica Bradaric

Makefile.am

@@ -70,7 +70,7 @@ EXTRA_DIST += $(ATK_DEFS) $(ATK_OVERRIDES)
 atk.c: $(ATK_DEFS) $(ATK_OVERRIDES)
 atk_la_CFLAGS = $(ATK_CFLAGS)
 atk_la_LIBADD = $(ATK_LIBS)
-atk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initatk
+atk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex PyInit_atk
 atk_la_SOURCES = atkmodule.c
 nodist_atk_la_SOURCES = atk.c
 if BUILD_ATK
@@ -85,7 +85,7 @@ EXTRA_DIST += $(PANGO_DEFS) pango.override
 pango.c: $(PANGO_DEFS) pango.override
 pango_la_CFLAGS = $(PANGO_CFLAGS)
 pango_la_LIBADD = $(PANGO_LIBS)
-pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango
+pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex PyInit_pango
 pango_la_SOURCES = pangomodule.c
 nodist_pango_la_SOURCES = pango.c
 if BUILD_PANGO
@@ -99,7 +99,7 @@ CLEANFILES += pangocairo.c
 EXTRA_DIST += $(PANGOCAIRO_DEFS) pangocairo.override
 pangocairo.c: $(PANGOCAIRO_DEFS) pangocairo.override
 pangocairo_la_CFLAGS = $(PYCAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS)
-pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpangocairo
+pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex PyInit_pangocairo
 pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS)
 pangocairo_la_SOURCES = pangocairomodule.c
 nodist_pangocairo_la_SOURCES = pangocairo.c

atk-types.defs

@@ -26,6 +26,7 @@
   (parent "AtkObject")
   (c-name "AtkNoOpObject")
   (gtype-id "ATK_TYPE_NO_OP_OBJECT")
+  (heaptype #t)
 )
 
 (define-object ObjectFactory

atk.override

@@ -217,7 +217,7 @@ _wrap_atk_editable_text_insert_text(PyGObject *self, PyObject *args,
 
     atk_editable_text_insert_text(ATK_EDITABLE_TEXT(self->obj),
                                   string, length, &position);
-    return PyInt_FromLong(position);
+    return PyLong_FromLong(position);
 }
 %%
 override atk_image_get_image_size noargs
@@ -357,7 +357,7 @@ _wrap_atk_table_get_selected_columns(PyGObject *self)
     ret = atk_table_get_selected_columns(ATK_TABLE(self->obj), &selected);
     py_selected = PyTuple_New(ret);
     for (i = 0; i < ret; i++) {
-        PyTuple_SetItem(py_selected, i, PyInt_FromLong(selected[i]));
+        PyTuple_SetItem(py_selected, i, PyLong_FromLong(selected[i]));
     }
 
     g_free(selected);
@@ -374,7 +374,7 @@ _wrap_atk_table_get_selected_rows(PyGObject *self)
     ret = atk_table_get_selected_rows(ATK_TABLE(self->obj), &selected);
     py_selected = PyTuple_New(ret);
     for (i = 0; i < ret; i++) {
-        PyTuple_SetItem(py_selected, i, PyInt_FromLong(selected[i]));
+        PyTuple_SetItem(py_selected, i, PyLong_FromLong(selected[i]));
     }
 
     g_free(selected);

atkmodule.c

@@ -33,16 +33,26 @@ void _pyatk_register_boxed_types(void);
 
 extern PyMethodDef pyatk_functions[];
 
-DL_EXPORT(void)
-initatk(void)
+static struct PyModuleDef atkmodule_def = {
+    PyModuleDef_HEAD_INIT,
+    "atk",
+    NULL,
+    -1,
+    pyatk_functions
+};
+
+PyMODINIT_FUNC
+PyInit_atk(void)
 {
     PyObject *m, *d;
 
-    init_pygobject ();
+    if (!pygobject_init(-1, -1, -1))
+	return NULL;
 
-    m = Py_InitModule ("atk", pyatk_functions);
+    m = PyModule_Create(&atkmodule_def);
     d = PyModule_GetDict (m);
     _pyatk_register_boxed_types();	
     pyatk_register_classes (d);
     pyatk_add_constants(m, "ATK_");    
+    return m;
 }

atkrectangle.override

@@ -105,10 +105,10 @@ _wrap_atk_rectangle_getitem(PyGBoxed *self, Py_ssize_t pos)
     }
     rect = pyg_boxed_get(self, AtkRectangle);
     switch (pos) {
-    case 0: return PyInt_FromLong(rect->x);
-    case 1: return PyInt_FromLong(rect->y);
-    case 2: return PyInt_FromLong(rect->width);
-    case 3: return PyInt_FromLong(rect->height);
+    case 0: return PyLong_FromLong(rect->x);
+    case 1: return PyLong_FromLong(rect->y);
+    case 2: return PyLong_FromLong(rect->width);
+    case 3: return PyLong_FromLong(rect->height);
     default:
         g_assert_not_reached();
         return NULL;
@@ -126,7 +126,7 @@ _wrap_atk_rectangle_setitem(PyGBoxed *self, Py_ssize_t pos, PyObject *value)
         return -1;
     }
     rect = pyg_boxed_get(self, AtkRectangle);
-    val = PyInt_AsLong(value);
+    val = PyLong_AsLong(value);
     if (PyErr_Occurred())
         return -1;
     switch(pos) {
@@ -158,7 +158,7 @@ _wrap_atk_rectangle__set_x(PyGBoxed *self, PyObject *value, void *closure)
 {
     gint val;
 
-    val = PyInt_AsLong(value);
+    val = PyLong_AsLong(value);
     if (PyErr_Occurred())
         return -1;
     pyg_boxed_get(self, AtkRectangle)->x = val;
@@ -171,7 +171,7 @@ _wrap_atk_rectangle__set_y(PyGBoxed *self, PyObject *value, void *closure)
 {
     gint val;
 
-    val = PyInt_AsLong(value);
+    val = PyLong_AsLong(value);
     if (PyErr_Occurred())
         return -1;
     pyg_boxed_get(self, AtkRectangle)->y = val;
@@ -184,7 +184,7 @@ _wrap_atk_rectangle__set_width(PyGBoxed *self, PyObject *value, void *closure)
 {
     gint val;
 
-    val = PyInt_AsLong(value);
+    val = PyLong_AsLong(value);
     if (PyErr_Occurred())
         return -1;
     pyg_boxed_get(self, AtkRectangle)->width = val;
@@ -197,7 +197,7 @@ _wrap_atk_rectangle__set_height(PyGBoxed *self, PyObject *value, void *closure)
 {
     gint val;
 
-    val = PyInt_AsLong(value);
+    val = PyLong_AsLong(value);
     if (PyErr_Occurred())
         return -1;
     pyg_boxed_get(self, AtkRectangle)->height = val;

configure.ac

@@ -20,6 +20,7 @@ m4_define(pygobject_required_version,  2.21.3)
 AC_INIT(pygtk, pygtk_version,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=pygtk])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I .")
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_DEFINE(PYGTK_MAJOR_VERSION, pygtk_major_version, [PyGtk major version])
 AC_SUBST(PYGTK_MAJOR_VERSION, pygtk_major_version)
@@ -80,7 +81,7 @@ AM_PATH_PYTHON(2.3.5)
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
 AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
 old_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
 AC_TRY_COMPILE([#include <Python.h>],
@@ -453,7 +454,7 @@ AC_ARG_ENABLE(numpy,
 
 if test "x$enable_numpy" != xno; then
   save_CPPFLAGS="$CPPFLAGS"
-  numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()" 2> /dev/null`
+  numpy_INCLUDES=`$PYTHON -c "import numpy; print(numpy.get_include())" 2> /dev/null`
   if test "x$numpy_INCLUDES" = "x"; then
     AC_MSG_WARN([Could not find a valid numpy installation, disabling.])
     enable_numpy=no

examples/glade/autoconnect.py

@@ -13,7 +13,7 @@ def __init__(self):
         xml.signal_autoconnect(self)
 
     def on_button1_clicked(self, button):
-        print 'foo!'
+        print('foo!')
 
 test = SimpleTest()
 gtk.main()

examples/gobject/editable-interface.py

@@ -11,7 +11,7 @@ def __init__(self, text):
         self.set_text(text)
 
     def do_do_delete_text(self, start_pos, end_pos):
-        print "do_do_delete_text", start_pos, end_pos
+        print("do_do_delete_text", start_pos, end_pos)
         gtk.Entry.do_do_delete_text(self, start_pos, end_pos)
 
 gobject.type_register(EditableLabel)

examples/gobject/properties.py

@@ -14,32 +14,32 @@ def __init__(self):
         self.__gobject_init__()
         self.foo = 'bar'
     def do_set_property(self, pspec, value):
-        print '    do_set_property called for %s=%r' % (pspec.name, value)
+        print('    do_set_property called for %s=%r' % (pspec.name, value))
         if pspec.name == 'foo':
             self.foo = value
         else:
-            raise AttributeError, 'unknown property %s' % pspec.name
+            raise AttributeError('unknown property %s' % pspec.name)
     def do_get_property(self, pspec):
-        print '    do_get_property called for %s' % pspec.name
+        print('    do_get_property called for %s' % pspec.name)
         if pspec.name == 'foo':
             return self.foo
         elif pspec.name == 'boolprop':
             return 1
         else:
-            raise AttributeError, 'unknown property %s' % pspec.name
+            raise AttributeError('unknown property %s' % pspec.name)
 gobject.type_register(MyObject)
 
-print "MyObject properties: ", gobject.list_properties(MyObject)
+print("MyObject properties: ", gobject.list_properties(MyObject))
 obj = MyObject()
 
 val = obj.get_property('foo')
-print "obj.get_property('foo') == ", val
+print("obj.get_property('foo') == ", val)
 
 obj.set_property('foo', 'spam')
-print "obj.set_property('foo', 'spam')"
+print("obj.set_property('foo', 'spam')")
 
 val = obj.get_property('foo')
-print "obj.get_property('foo') == ", val
+print("obj.get_property('foo') == ", val)
 
 val = obj.get_property('boolprop')
-print "obj.get_property('boolprop') == ", val
+print("obj.get_property('boolprop') == ", val)

examples/gobject/signal.py

@@ -10,16 +10,16 @@ class C(gobject.GObject):
     def __init__(self):
         self.__gobject_init__() # default constructor using our new GType
     def do_my_signal(self, arg):
-        print "C: class closure for `my_signal' called with argument", arg
+        print("C: class closure for `my_signal' called with argument", arg)
 
 class D(C):
     def do_my_signal(self, arg):
-        print "D: class closure for `my_signal' called.  Chaining up to C"
+        print("D: class closure for `my_signal' called.  Chaining up to C")
         C.do_my_signal(self, arg)
 
 def my_signal_handler(object, arg, *extra):
-    print "handler for `my_signal' called with argument", arg, \
-          "and extra args", extra
+    print("handler for `my_signal' called with argument", arg, \
+          "and extra args", extra)
 
 inst = C()
 inst2 = D()