Merge lp:~pitti/ubuntu-sso-client/gi-fixes into lp:ubuntu-sso-client
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||
Approved revision: | 766 | ||||
Merged at revision: | 763 | ||||
Proposed branch: | lp:~pitti/ubuntu-sso-client/gi-fixes | ||||
Merge into: | lp:ubuntu-sso-client | ||||
Diff against target: |
24 lines (+8/-2) 1 file modified
ubuntu_sso/utils/txsecrets.py (+8/-2) |
||||
To merge this branch: | bzr merge lp:~pitti/ubuntu-sso-client/gi-fixes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Review via email: mp+72527@code.launchpad.net |
Commit message
- Do not mix static with gi bindings (LP: #829186).
Description of the change
pygobject >= 2.90 is now absolutely zero tolerant against importing both the
static and the GI version of a particular library. This was mostly the case
with 2.28 as well, but did work in some cases (like "import gobject; from
gi.repository import Gtk", in particular for "glib" and "gobject"). These now
cause errors as well.
With this fix we can use the library from both programs with static bindings
(gobject, gtk), as well as from programs which use the gobject-
bindings.
See bug 829186 for more details.
This is a dependency of
https:/
Hi Martin!
The branch looks great, I'm approving. In order to have this branch being landed by tarmac (our bot lander), we'll need that the test run (triggered by ./run-tests) reports no lint errors. ATM, in natty, I'm getting this:
ubuntu_ sso/utils/ txsecrets. py:
28: [E0611] No name 'GObject' in module 'gi.repository'
You need to wrap the from gi.repository import GObject like this:
else:
# pylint: disable=E0611
from gi.repository import GObject
# pylint: enable=E0611