Changeset 16662

Timestamp:

06/20/08 15:03:20 (4 months ago)

Author:

piotras

Message:

Implemented properties' getter and setter.

Files:

• trunk/midgard/apis/python/py_midgard_object.c (modified) (4 diffs)

trunk/midgard/apis/python/py_midgard_object.c

@@ -148 +148 @@
-                        /* Py_DECREF(pyval); */
-                }
-
+      
-
-        return (self->obj) ? 0 : -1;
@@ -590 +590 @@
-}
-
+static PyObject *
+__get_attro(PyObject *self, PyObject *attr)
+{
+        GObject *object = G_OBJECT(((PyGObject*)self)->obj);
+
+        /* Now we do fallback to generic GetAttr */
+        if(!object) 
+                return PyObject_GenericGetAttr(self, attr);
+
+        /* There's underlying GObject so we can run custom routines and get property*/
+        GObjectClass *klass = G_OBJECT_GET_CLASS(object);
+        GParamSpec *pspec;
+        const gchar *attr_name = PyString_AsString(attr);
+        PyTypeObject *tp = self->ob_type;
+
+        pspec = g_object_class_find_property(klass, attr_name);
+
+        if(!pspec) {
+                
+                PyErr_Format(PyExc_AttributeError,
+                                "'%.50s' object has no attribute '%.400s'",
+                                tp->tp_name, attr_name);
+                return NULL;
+        }
+
+        GValue pval = {0, };
+        g_value_init(&pval, pspec->value_type);
+        g_object_get_property(object, attr_name, &pval);
+
+        PyObject *pvalue = pyg_value_as_pyobject((const GValue *)&pval, FALSE);
+
+        g_value_unset(&pval);
+
+        return pvalue;
+}
+
+static int
+__set_attro(PyObject *self, PyObject *attr, PyObject *value)
+{
+        GObject *object = G_OBJECT(((PyGObject*)self)->obj);
+
+        /* Now we do fallback to generic SetAttr */
+        if(!object) 
+                return PyObject_GenericSetAttr(self, attr, value);
+
+        /* There's underlying GObject so we can run custom routines and set property*/
+        GObjectClass *klass = G_OBJECT_GET_CLASS(object);
+        GParamSpec *pspec;
+        const gchar *attr_name = PyString_AsString(attr);
+        PyTypeObject *tp = self->ob_type;
+
+        pspec = g_object_class_find_property(klass, attr_name);
+
+        if(!pspec) {
+                
+                PyErr_Format(PyExc_AttributeError,
+                                "'%.50s' object has no attribute '%.400s'",
+                                tp->tp_name, attr_name);
+                return -1;
+        }
+
+        GValue pval = {0, };
+        g_value_init(&pval, pspec->value_type);
+        pyg_value_from_pyobject(&pval, value);
+
+        g_object_set_property(object, attr_name, &pval);
+
+        g_value_unset(&pval);
+
+        return 0;
+}
+
-PyTypeObject *__new_object_struct(const gchar *typename)
-{
@@ -617 +689 @@
-        ot->tp_call = 0;
-        ot->tp_str = 0;
-0
-0
+__get_attro
+__set_attro
-        ot->tp_as_buffer = 0;
-        ot->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
@@ -668 +740 @@
-
-        for (i = 0; i < n_types; i++) {
-
+
-                typename = g_type_name(all_types[i]);
+                /* g_warning("Trying to register '%s'", typename); */
+
+                if(!G_TYPE_IS_CLASSED(all_types[i]))
+                        continue;
+
-                PyTypeObject *ot = __new_object_struct(typename);
-                pygobject_register_class(d,
-
+ 
-                                /* FIXME, What is a static bases in this case? */
-                                /* Py_BuildValue("(O)", pygobject_type)); */