Merge lp:~mvo/dee/small-python-fixes into lp:dee

[Michael Vogt]

This fixes the python examples in the source to work

[Michal Hruby (mhr3)]

Thanks for these

8 - self.set_schema_full (tuple(args), len(args))
9 + self.set_schema_full (tuple(args))

Would be nice if pygobject didn't change something every other version :( Ideally there should be a way to make it work with new as well as old pygobject (doesn't pygobject provide it's version in some prop?)

[Michael Vogt (mvo)]

On Tue, Sep 11, 2012 at 02:53:30PM -0000, Michal Hruby wrote:
> Thanks for these
>
> 8 - self.set_schema_full (tuple(args), len(args))
> 9 + self.set_schema_full (tuple(args))
>
> Would be nice if pygobject didn't change something every other version :( Ideally there should be a way to make it work with new as well as old pygobject (doesn't pygobject provide it's version in some prop?)

Since recently there is a gi.version_info that could be used, but its
not available on precsie and I don't know when exactly it was added
(nor when exactly the bindings broke).

So I think there these options:

- simply require latest python-gi and change unconditionally

- I could do a try/except AttributeError but that carries the risk that
it shadows other errors so I'm not really advocating it.

- Something like:
=== modified file 'bindings/python/Dee.py'
--- bindings/python/Dee.py 2012-09-11 14:41:44 +0000
+++ bindings/python/Dee.py 2012-09-12 10:36:47 +0000
@@ -1,3 +1,4 @@
+import gi
 from gi.overrides import override
 from gi.importer import modules

@@ -40,7 +41,12 @@
         Dee.Model.__init__(self)

     def set_schema (self, *args):
- self.set_schema_full (tuple(args))
+ version = getattr(gi.version_info, None)
+ # mvo: I don't know when *exactly* this changed
+ if version and version[0] > 3 and version[1] > 3:
+ self.set_schema_full (tuple(args))
+ else:
+ self.set_schema_full (tuple(args), len(args))

     def _build_row (self, args):
         result = []

[Michal Hruby (mhr3)]

> On Tue, Sep 11, 2012 at 02:53:30PM -0000, Michal Hruby wrote:
> > Thanks for these
> >
> > 8 - self.set_schema_full (tuple(args), len(args))
> > 9 + self.set_schema_full (tuple(args))
> >
> > Would be nice if pygobject didn't change something every other version :(
> Ideally there should be a way to make it work with new as well as old
> pygobject (doesn't pygobject provide it's version in some prop?)
>
> Since recently there is a gi.version_info that could be used, but its
> not available on precsie and I don't know when exactly it was added
> (nor when exactly the bindings broke).
>
> So I think there these options:
>
> - simply require latest python-gi and change unconditionally
>
> - I could do a try/except AttributeError but that carries the risk that
> it shadows other errors so I'm not really advocating it.
>

As long as it works on both P and Q, I'm fine with it, we don't need to support every version combination... And +1 for avoiding the use of try except.

Could you also link a bug about this pls?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:380
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/5/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/5//rebuild/?

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

I think this was fixed long time ago.

Unmerged revisions

380. By Michael Vogt on 2012-09-11

examples/slave-model.py: fix the example to actually work

379. By Michael Vogt on 2012-09-11

bindings/python/Dee.py: make set_schema() not crash

=== modified file 'bindings/python/Dee.py'
--- bindings/python/Dee.py	2012-08-15 13:36:15 +0000
+++ bindings/python/Dee.py	2012-09-11 14:43:23 +0000
@@ -40,7 +40,7 @@
         Dee.Model.__init__(self)
 
     def set_schema (self, *args):
-        self.set_schema_full (tuple(args), len(args))
+        self.set_schema_full (tuple(args))
     
     def _build_row (self, args):
         result = []
 
=== modified file 'examples/slave-model.py'
--- examples/slave-model.py	2011-02-09 03:44:27 +0000
+++ examples/slave-model.py	2012-09-11 14:43:23 +0000
@@ -31,16 +31,17 @@
     self.model.connect("row-added", self.on_row_added, None)
 
   def print_row (self, model, iter):
+    i = 0
     while i < self.model.get_n_columns ():
-      s = str(self.model.get_value (model, iter, i))
+      s = str(self.model.get_value (iter, i))
       if (i == 0):
         print "ADDED: %s" % s
       else:
         print ", %s" % s
       i = i + 1
 
-  def on_row_added(self, model, iter):
-    print_row(model, iter)
+  def on_row_added(self, model, iter, data):
+    self.print_row(model, iter)
 
 if __name__ == "__main__":