Merge lp:~pitti/ubuntuone-client/gi-fixes into lp:ubuntuone-client

[Martin Pitt]

Conditionally use GI or static gobject depending on whether gobject is already loaded. That way this module works with both static and GI programs. (LP: #829186)

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-introspection
bindings.

See bug 829186 for more details.

[Facundo Batista (facundo)]

Can't we leave the latest way only?

I mean, only do...

    from gi.repository import Gio, GLib

...and use that.

Thanks!

review: Needs Information

[Martin Pitt (pitti)]

Unfortunately not. The conditional static/GI import needs to stay until all users of python-ubuntone are converted to use GI. With pygobject >= 2.90 you cannot mix static and GI imports, and the ubuntuone-control-panel is still using pygtk, gobject, etc. See the description of bug 828751 for the background why we have to do this.

For the record, I also already had the test suite of this ported to GI. However, that does not work, as the test suite uses twisted, which uses static gtk/gobject modules. So I'm afraid for the time being the test suite can only check the static part here, not the GI part.

[lp:~pitti/ubuntuone-client/gi-fixes]

1112. By Martin Pitt on 2011-08-23

ubuntuone/platform/linux/notification.py: Use GI Notify module when using GI

[Martin Pitt (pitti)]

I also fixed the notification module to use gi.repository.Notify when the process is already using GI. Otherwise pynotify once again pulls in the static gobject.

[Martin Pitt (pitti)]

This depends on https://code.launchpad.net/~pitti/ubuntu-sso-client/gi-fixes/+merge/72527

[Facundo Batista (facundo)]

Go for it

review: Approve

[Natalia Bidart (nataliabidart)]

Code looks good, but there is a link issue here:

./ubuntuone/platform/linux/notification.py:
    34: redefinition of unused 'Notify' from line 28

To run the suite, please do the following:

./autogen.sh
make check

Thanks!

review: Needs Fixing

[Martin Pitt (pitti)]

I fixed the pyflakes complaint.

review: Resubmit

[lp:~pitti/ubuntuone-client/gi-fixes]

1113. By Martin Pitt on 2011-08-24

work around pyflakes complaint

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone/platform/linux/notification.py'
--- ubuntuone/platform/linux/notification.py	2011-03-03 23:29:37 +0000
+++ ubuntuone/platform/linux/notification.py	2011-08-24 10:39:28 +0000
@@ -21,18 +21,27 @@
 # are available, we should fall back to silently discarding
 # notifications.
 
-try:
-    import pynotify
-    USE_PYNOTIFY = True
-except ImportError:
-    USE_PYNOTIFY = False
+import sys
+NOTIFY_MODULE = None
+if 'gi' in sys.modules:
+    try:
+        from gi.repository import Notify
+        Notify # pyflakes
+        NOTIFY_MODULE = 'gi'
+    except ImportError:
+        pass
+else:
+    try:
+        import pynotify as Notify
+        NOTIFY_MODULE = 'pynotify'
+    except ImportError:
+        pass
 
 from ubuntuone.status.notification import AbstractNotification
 
 APPLICATION_NAME = 'Ubuntu One Client'
 ICON_NAME = "ubuntuone"
 
-
 class Notification(AbstractNotification):
     """Notification of the end user."""
 
@@ -44,12 +53,17 @@
 
     def send_notification(self, title, message, icon=ICON_NAME, append=False):
         """Send a notification using the underlying library."""
-        if USE_PYNOTIFY:
-            if self.notification is None:
-                pynotify.init(self.application_name)
-                self.notification = pynotify.Notification(title, message, icon)
+        if not NOTIFY_MODULE:
+            return
+
+        if self.notification is None:
+            Notify.init(self.application_name)
+            if NOTIFY_MODULE == 'gi':
+                self.notification = Notify.Notification.new(title, message, icon)
             else:
-                self.notification.update(title, message, icon)
-            if append:
-                self.notification.set_hint_string('x-canonical-append', '')
-            self.notification.show()
+                self.notification = Notify.Notification(title, message, icon)
+        else:
+            self.notification.update(title, message, icon)
+        if append:
+            self.notification.set_hint_string('x-canonical-append', '')
+        self.notification.show()

=== modified file 'ubuntuone/platform/linux/os_helper.py'
--- ubuntuone/platform/linux/os_helper.py	2011-08-17 20:20:21 +0000
+++ ubuntuone/platform/linux/os_helper.py	2011-08-24 10:39:28 +0000
@@ -27,8 +27,14 @@
 import os
 import shutil
 import stat
+import sys
 
-import gio
+if 'gobject' in sys.modules:
+    import gio
+    has_gi = False
+else:
+    from gi.repository import Gio, GLib
+    has_gi = True
 
 from contextlib import contextmanager
 
@@ -164,14 +170,24 @@
 
     If had any error, or the system can't do it, just remove it.
     """
-    try:
-        return_code = gio.File(path).trash()
-    except gio.Error:
-        exc = OSError()
-        exc.errno = errno.ENOENT
-        raise exc
+    if has_gi:
+        not_supported = Gio.IOErrorEnum.NOT_SUPPORTED
+        try:
+            return_code = Gio.File.new_for_path(path).trash(None)
+        except GLib.GError:
+            exc = OSError()
+            exc.errno = errno.ENOENT
+            raise exc
+    else:
+        not_supported = gio.ERROR_NOT_SUPPORTED
+        try:
+            return_code = gio.File(path).trash()
+        except gio.Error:
+            exc = OSError()
+            exc.errno = errno.ENOENT
+            raise exc
 
-    if not return_code or return_code == gio.ERROR_NOT_SUPPORTED:
+    if not return_code or return_code == not_supported:
         logger.warning("Problems moving to trash! (%s) Removing anyway: %r",
                        return_code, path)
         if os.path.isdir(path):
@@ -182,9 +198,12 @@
 
 def set_application_name(app_name):
     """Set the name of the application."""
-    import gobject
-    gobject.set_application_name(app_name)
-
+    if has_gi:
+        from gi.repository import GObject
+        GObject.set_application_name(app_name)
+    else:
+        import gobject
+        gobject.set_application_name(app_name)
 
 def is_root():
     """Return if the user is running as root."""