Merge lp:~davidc3/dee/python3-overrides into lp:dee

[David Callé]

provide a gir override for python3

While I'm not sure if it's the good way to create gi overrides, the provided python3/Dee.py works in Python3 and allow lenses to use the bindings.

[Didier Roche-Tolomelli (didrocks)]

The override worked on python3 for me. Approving (manual test already covered)

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'bindings/Makefile.am'
--- bindings/Makefile.am	2011-02-14 09:17:36 +0000
+++ bindings/Makefile.am	2012-05-18 18:47:18 +0000
@@ -1,2 +1,2 @@
-SUBDIRS = python
+SUBDIRS = python python3
 

=== added directory 'bindings/python3'
=== added file 'bindings/python3/Dee.py'
--- bindings/python3/Dee.py	1970-01-01 00:00:00 +0000
+++ bindings/python3/Dee.py	2012-05-18 18:47:18 +0000
@@ -0,0 +1,115 @@
+from gi.overrides import override
+from gi.importer import modules
+
+Dee = modules['Dee']._introspection_module
+from gi.repository import GLib
+
+__all__ = []
+
+class RowWrapper:
+    def __init__ (self, model, itr):
+        self.model = model
+        self.itr = itr
+    
+    def __getitem__ (self, column):
+        return self.model.get_value(self.itr, column)
+    
+    def __setitem__ (self, column, val):
+        self.model.set_value (self.itr, column, val)
+    
+    def __iter__ (self):
+        for column in range(self.model.get_n_columns()):
+            yield self.model.get_value (self.itr, column)
+    
+    def __len__ (self):
+        return self.model.get_n_columns()
+    
+    def __str__ (self):
+        return "(%s)" % ", ".join(map(str,self))
+    
+    def __eq__ (self, other):
+        if not isinstance (other, RowWrapper):
+            return False
+        if self.model != other.model:
+            return False
+        return self.itr == other.itr
+
+class Model(Dee.Model):
+
+    def __init__(self):
+        Dee.Model.__init__(self)
+
+    def set_schema (self, *args):
+        self.set_schema_full (tuple(args), len(args))
+    
+    def _build_row (self, args):
+        result = []
+        for i, arg in enumerate(args):
+            if isinstance(arg, GLib.Variant):
+                result.append(arg)
+            else:
+                result.append(GLib.Variant(self.get_column_schema(i), arg))
+        return tuple(result)
+    
+    def prepend (self, *args):
+        return self.prepend_row (self._build_row(args))
+    
+    def append (self, *args):
+        return self.append_row (self._build_row(args))
+    
+    def insert (self, pos, *args):
+        return self.insert_row (pos, self._build_row(args))
+    
+    def insert_before (self, iter, *args):
+        return self.insert_row_before (iter, self._build_row(args))
+    
+    def insert_sorted (self, sort_func, *args):
+    	return self.insert_row_sorted (self._build_row(args), sort_func, None)
+   
+    def find_sorted (self, sort_func, *args):
+    	return self.find_row_sorted (self._build_row(args), sort_func, None)
+    
+    def get_schema (self):
+        return Dee.Model.get_schema(self)[0]
+    
+    def get_value (self, itr, column):
+        return Dee.Model.get_value (self, itr, column).unpack()
+    
+    def set_value (self, itr, column, value):
+        var = GLib.Variant (self.get_column_schema(column), value)
+        if isinstance (itr, int):
+            itr = self.get_iter_at_row(itr)
+        Dee.Model.set_value (self, itr, column, var)
+    
+    def __getitem__ (self, itr):
+        if isinstance (itr, int):
+            itr = self.get_iter_at_row(itr)
+        return RowWrapper(self, itr)
+    
+    def __setitem__ (self, itr, row):
+        max_col = self.get_n_columns ()
+        for column, value in enumerate (row):
+            if column >= max_col:
+                raise IndexError("Too many columns in row assignment: %s" % column)
+            self.set_value (itr, column, value)
+    
+    def get_row (self, itr):
+        return self[itr]
+    
+    def __iter__ (self):
+        itr = self.get_first_iter ()
+        last = self.get_last_iter ()
+        while itr != last:
+            yield self.get_row(itr)
+            itr = self.next(itr)
+        raise StopIteration
+    
+    def __len__ (self):
+        return self.get_n_rows()
+        
+        
+
+Model = override(Model)
+__all__.append('Model')
+
+

=== added file 'bindings/python3/Makefile.am'
--- bindings/python3/Makefile.am	1970-01-01 00:00:00 +0000
+++ bindings/python3/Makefile.am	2012-05-18 18:47:18 +0000
@@ -0,0 +1,10 @@
+PLATFORM_VERSION = 3.0
+
+pkgpyexecdir = $(pyexecdir)/gi
+
+pygioverridesdir = $(pkgpyexecdir)/overrides
+pygioverrides_PYTHON = \
+        Dee.py
+
+EXTRA_DIST = Dee.py
+

=== modified file 'configure.ac'
--- configure.ac	2012-04-12 07:31:04 +0000
+++ configure.ac	2012-05-18 18:47:18 +0000
@@ -193,6 +193,7 @@
   src/Makefile
   bindings/Makefile
   bindings/python/Makefile
+  bindings/python3/Makefile
   doc/Makefile
   doc/reference/Makefile
   doc/reference/dee-1.0/Makefile