Merge lp:~pitti/ubiquity/pygobject-fixes into lp:ubiquity

[Martin Pitt]

This branch fixes ubiquity to work with current pygobject (see current autopkgtest failure in -proposed), and fixes some long-deprecated API which pygobject 3.7.x now triggers warnings for.

Note that I get two test failures locally:

ERROR: test_interface_translated (test_gtkui.TestFrontend)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/martin/ubuntu/ubiquity/tests/test_gtkui.py", line 141, in test_interface_translated
    % missing_translations)
Exception: Missing translation for:
question_label, ubi_question_dialog

======================================================================
FAIL: test_windows_only (test_ubi_partman.TestCalculateAutopartitioningOptions)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/martin/ubuntu/ubiquity/tests/test_ubi_partman.py", line 508, in test_windows_only
    self.assertIn('resize', options)
AssertionError: 'resize' not found in {'manual': PartitioningOption(title='Something else', desc='You can create or resize partitions yourself, or choose multiple partitions for Ubuntu.')}

----------------------------------------------------------------------

These happen with the old and new pygobject, and with and without the branch.
They might be a local problem on my checkout/workstation, of course; does that
tell anything to you?

[Dimitri John Ledkov (xnox)]

Fixed the two test suite failures that I have introduced in 5771, sorry for hassle.

I had to fix the pep8 & pyflakes warnings from your merge proposal. Next time, please run ./test/run-pep8 & ./test/run-pyflakes as well. (they are run as part part of clean target, as well as the shell syntax checks).

Merged.

review: Approve

=== modified file 'bin/oem-config-remove-gtk'
--- bin/oem-config-remove-gtk	2012-09-06 17:13:01 +0000
+++ bin/oem-config-remove-gtk	2012-11-27 06:10:25 +0000
@@ -26,10 +26,10 @@
 import glob
 
 from aptdaemon.gtk3widgets import AptProgressDialog
-from gi.repository import GObject, Gtk
+from gi.repository import GLib, Gtk
 from aptdaemon import client, enums
 
-loop = GObject.MainLoop()
+loop = GLib.MainLoop()
 
 
 def _on_failure(error):
 
=== modified file 'bin/ubiquity-bluetooth-agent'
--- bin/ubiquity-bluetooth-agent	2012-07-16 14:29:13 +0000
+++ bin/ubiquity-bluetooth-agent	2012-11-27 06:10:25 +0000
@@ -6,7 +6,7 @@
 import dbus
 import dbus.service
 import dbus.mainloop.glib
-from gi.repository import GObject
+from gi.repository import GLib
 
 
 class Rejected(dbus.DBusException):
@@ -97,10 +97,10 @@
         bus.get_object("org.bluez", manager.DefaultAdapter()),
         "org.bluez.Adapter")
     agent = Agent(bus, "/ubiquity/bluetooth/agent")
-    mainloop = GObject.MainLoop()
+    mainloop = GLib.MainLoop()
     adapter.RegisterAgent("/ubiquity/bluetooth/agent", "DisplayYesNo")
 except dbus.exceptions.DBusException:
     exit_handler()
 
-GObject.timeout_add(300000, exit_handler)
+GLib.timeout_add(300000, exit_handler)
 mainloop.run()
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-11-26 13:06:06 +0000
+++ debian/changelog	2012-11-27 06:10:25 +0000
@@ -14,6 +14,14 @@
   * Fonconfig-voodoo is gone, not sure if some other "fontconfig"ury
     should be called instead. (LP: #1043031)
 
+  [ Martin Pitt ]
+  * ubiquity/gtkwidgets.py: Don't use GObject.constants, just use the
+    constants from GObject as intended. Fixes a crash with pygobject
+    3.7.2.
+  * Use glib API from the GLib GI module instead of GObject. The latter
+    has been deprecated for a long time and triggers warnings with pygobject
+    3.7.2.
+
  -- Colin Watson <[e-mail]>  Thu, 22 Nov 2012 16:25:28 +0000
 
 ubiquity (2.13.3) raring; urgency=low
 
=== modified file 'tests/test_timezone.py'
--- tests/test_timezone.py	2012-11-22 16:27:21 +0000
+++ tests/test_timezone.py	2012-11-27 06:10:25 +0000
@@ -25,9 +25,9 @@
     @mock.patch('gi.repository.Soup.Message')
     @mock.patch('json.loads')
     def test_city_entry(self, json_mock, *args):
-        from gi.repository import GObject
+        from gi.repository import GLib
 
-        # Patch GObject.timeout_add_seconds to call the supplied function
+        # Patch GLib.timeout_add_seconds to call the supplied function
         # immediately rather than waiting for the interval to expire.
         def side_effect_factory(real_method):
             def side_effect(interval, function, data):
@@ -35,8 +35,8 @@
             return side_effect
 
         json_mock.return_value = []
-        real_method = GObject.timeout_add_seconds
-        method = mock.patch('gi.repository.GObject.timeout_add_seconds')
+        real_method = GLib.timeout_add_seconds
+        method = mock.patch('gi.repository.GLib.timeout_add_seconds')
         timeout_mock = method.start()
         timeout_mock.side_effect = side_effect_factory(real_method)
         self.addCleanup(method.stop)
 
=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2012-10-19 01:18:48 +0000
+++ ubiquity/frontend/gtk_ui.py	2012-11-27 06:10:25 +0000
@@ -49,7 +49,7 @@
 
 #in query mode we won't be in X, but import needs to pass
 if 'DISPLAY' in os.environ:
-    from gi.repository import Gtk, Gdk, GObject
+    from gi.repository import Gtk, Gdk, GObject, GLib
     GObject.threads_init()
     from ubiquity import gtkwidgets
 
@@ -468,13 +468,13 @@
             sys.exit(1)
 
     def network_change(self, online=False):
-        from gi.repository import GObject
+        from gi.repository import GLib
         if not online:
             self.set_online_state(False)
             return
         if self.timeout_id:
-            GObject.source_remove(self.timeout_id)
-        self.timeout_id = GObject.timeout_add(300, self.check_returncode)
+            GLib.source_remove(self.timeout_id)
+        self.timeout_id = GLib.timeout_add(300, self.check_returncode)
 
     def set_online_state(self, state):
         for p in self.pages:
@@ -751,7 +751,7 @@
 
                 if self.dbfilter is not None and self.dbfilter != old_dbfilter:
                     self.allow_change_step(False)
-                    GObject.idle_add(
+                    GLib.idle_add(
                         lambda: self.dbfilter.start(auto_process=True))
 
                 page.controller.dbfilter = self.dbfilter
@@ -1448,17 +1448,17 @@
     # Callbacks provided to components.
 
     def watch_debconf_fd(self, from_debconf, process_input):
-        GObject.io_add_watch(from_debconf,
-                             GObject.IO_IN | GObject.IO_ERR | GObject.IO_HUP,
-                             self.watch_debconf_fd_helper, process_input)
+        GLib.io_add_watch(from_debconf,
+                          GLib.IO_IN | GLib.IO_ERR | GLib.IO_HUP,
+                          self.watch_debconf_fd_helper, process_input)
 
     def watch_debconf_fd_helper(self, source, cb_condition, callback):
         debconf_condition = 0
-        if (cb_condition & GObject.IO_IN) != 0:
+        if (cb_condition & GLib.IO_IN) != 0:
             debconf_condition |= filteredcommand.DEBCONF_IO_IN
-        if (cb_condition & GObject.IO_ERR) != 0:
+        if (cb_condition & GLib.IO_ERR) != 0:
             debconf_condition |= filteredcommand.DEBCONF_IO_ERR
-        if (cb_condition & GObject.IO_HUP) != 0:
+        if (cb_condition & GLib.IO_HUP) != 0:
             debconf_condition |= filteredcommand.DEBCONF_IO_HUP
 
         return callback(source, debconf_condition)
@@ -1751,7 +1751,7 @@
 
         def quit_quit():
             # Wait until we're actually out of this main loop
-            GObject.idle_add(idle_quit)
+            GLib.idle_add(idle_quit)
             return False
 
         if self.pending_quits == 0:
 
=== modified file 'ubiquity/frontend/noninteractive.py'
--- ubiquity/frontend/noninteractive.py	2012-09-25 20:59:09 +0000
+++ ubiquity/frontend/noninteractive.py	2012-11-27 06:10:25 +0000
@@ -30,7 +30,7 @@
 import signal
 import sys
 
-from gi.repository import GObject
+from gi.repository import GLib
 
 from ubiquity import filteredcommand, i18n
 from ubiquity import misc
@@ -53,7 +53,7 @@
         self.progress_position = ubiquity.progressposition.ProgressPosition()
         self.progress_val = 0
         self.progress_info = ''
-        self.mainloop = GObject.MainLoop()
+        self.mainloop = GLib.MainLoop()
 
         self.pages = []
         for mod in self.modules:
@@ -137,17 +137,17 @@
         from the filtered command and a process_input callback which should
         be called when input events are received."""
 
-        GObject.io_add_watch(from_debconf,
-                             GObject.IO_IN | GObject.IO_ERR | GObject.IO_HUP,
+        GLib.io_add_watch(from_debconf,
+                             GLib.IO_IN | GLib.IO_ERR | GLib.IO_HUP,
                              self.watch_debconf_fd_helper, process_input)
 
     def watch_debconf_fd_helper(self, source, cb_condition, callback):
         debconf_condition = 0
-        if (cb_condition & GObject.IO_IN) != 0:
+        if (cb_condition & GLib.IO_IN) != 0:
             debconf_condition |= filteredcommand.DEBCONF_IO_IN
-        if (cb_condition & GObject.IO_ERR) != 0:
+        if (cb_condition & GLib.IO_ERR) != 0:
             debconf_condition |= filteredcommand.DEBCONF_IO_ERR
-        if (cb_condition & GObject.IO_HUP) != 0:
+        if (cb_condition & GLib.IO_HUP) != 0:
             debconf_condition |= filteredcommand.DEBCONF_IO_HUP
 
         return callback(source, debconf_condition)
 
=== modified file 'ubiquity/gtkwidgets.py'
--- ubiquity/gtkwidgets.py	2012-11-22 16:27:21 +0000
+++ ubiquity/gtkwidgets.py	2012-11-27 06:10:25 +0000
@@ -39,10 +39,10 @@
     __gproperties__ = {
         'radius': (
             GObject.TYPE_INT, 'Radius', 'The radius of the rounded corners.',
-            0, GObject.constants.G_MAXINT, 10, GObject.PARAM_READWRITE),
+            0, GObject.G_MAXINT, 10, GObject.PARAM_READWRITE),
         'width': (
             GObject.TYPE_INT, 'Width', 'The width of the outline.',
-            0, GObject.constants.G_MAXINT, 1, GObject.PARAM_READWRITE),
+            0, GObject.G_MAXINT, 1, GObject.PARAM_READWRITE),
     }
 
     def __init__(self):
@@ -93,15 +93,15 @@
         'part_size': (
             GObject.TYPE_UINT64, 'Partition size',
             'The size of the partition being resized',
-            1, GObject.constants.G_MAXUINT64, 100, GObject.PARAM_READWRITE),
+            1, GObject.G_MAXUINT64, 100, GObject.PARAM_READWRITE),
         'min_size': (
             GObject.TYPE_UINT64, 'Minimum size',
             'The minimum size that the existing partition can be resized to',
-            0, GObject.constants.G_MAXUINT64, 0, GObject.PARAM_READWRITE),
+            0, GObject.G_MAXUINT64, 0, GObject.PARAM_READWRITE),
         'max_size': (
             GObject.TYPE_UINT64, 'Maximum size',
             'The maximum size that the existing partition can be resized to',
-            1, GObject.constants.G_MAXUINT64, 100, GObject.PARAM_READWRITE)
+            1, GObject.G_MAXUINT64, 100, GObject.PARAM_READWRITE)
     }
 
     def do_get_property(self, prop):
 
=== modified file 'ubiquity/nm.py'
--- ubiquity/nm.py	2012-07-16 14:29:13 +0000
+++ ubiquity/nm.py	2012-11-27 06:10:25 +0000
@@ -4,7 +4,7 @@
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
-from gi.repository import Gtk, GObject
+from gi.repository import Gtk, GObject, GLib
 
 NM = 'org.freedesktop.NetworkManager'
 NM_DEVICE = 'org.freedesktop.NetworkManager.Device'
@@ -174,8 +174,8 @@
 
     def queue_build_cache(self, *args):
         if self.timeout_id:
-            GObject.source_remove(self.timeout_id)
-        self.timeout_id = GObject.timeout_add(500, self.build_cache)
+            GLib.source_remove(self.timeout_id)
+        self.timeout_id = GLib.timeout_add(500, self.build_cache)
 
     def properties_changed(self, props, path=None):
         if 'Strength' in props:
@@ -275,8 +275,8 @@
 
         def queue_rows_changed(*args):
             if self.rows_changed_id:
-                GObject.source_remove(self.rows_changed_id)
-            self.rows_changed_id = GObject.idle_add(self.rows_changed)
+                GLib.source_remove(self.rows_changed_id)
+            self.rows_changed_id = GLib.idle_add(self.rows_changed)
 
         model.connect('row-inserted', queue_rows_changed)
         model.connect('row-deleted', queue_rows_changed)
 
=== modified file 'ubiquity/plugins/ubi-console-setup.py'
--- ubiquity/plugins/ubi-console-setup.py	2012-11-22 16:27:21 +0000
+++ ubiquity/plugins/ubi-console-setup.py	2012-11-27 06:10:25 +0000
@@ -106,10 +106,10 @@
     def on_keyboard_layout_selected(self, *args):
         if not 'UBIQUITY_AUTOMATIC' in os.environ:
             # Let's not call this every time the user presses a key.
-            from gi.repository import GObject
+            from gi.repository import GLib
             if self.keyboard_layout_timeout_id:
-                GObject.source_remove(self.keyboard_layout_timeout_id)
-            self.keyboard_layout_timeout_id = GObject.timeout_add(
+                GLib.source_remove(self.keyboard_layout_timeout_id)
+            self.keyboard_layout_timeout_id = GLib.timeout_add(
                 600, self.keyboard_layout_timeout)
         else:
             self.keyboard_layout_timeout()
@@ -128,10 +128,10 @@
     def on_keyboard_variant_selected(self, *args):
         if not 'UBIQUITY_AUTOMATIC' in os.environ:
             # Let's not call this every time the user presses a key.
-            from gi.repository import GObject
+            from gi.repository import GLib
             if self.keyboard_variant_timeout_id:
-                GObject.source_remove(self.keyboard_variant_timeout_id)
-            self.keyboard_variant_timeout_id = GObject.timeout_add(
+                GLib.source_remove(self.keyboard_variant_timeout_id)
+            self.keyboard_variant_timeout_id = GLib.timeout_add(
                 600, self.keyboard_variant_timeout)
         else:
             self.keyboard_variant_timeout()
 
=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2012-10-19 17:03:08 +0000
+++ ubiquity/plugins/ubi-language.py	2012-11-27 06:10:25 +0000
@@ -302,13 +302,13 @@
             w.show()
 
     def plugin_set_online_state(self, state):
-        from gi.repository import GObject
+        from gi.repository import GLib
         if self.release_notes_label:
             if self.timeout_id:
-                GObject.source_remove(self.timeout_id)
+                GLib.source_remove(self.timeout_id)
             if state:
                 self.release_notes_label.show()
-                self.timeout_id = GObject.timeout_add(
+                self.timeout_id = GLib.timeout_add(
                     300, self.check_returncode)
             else:
                 self.release_notes_label.hide()
 
=== modified file 'ubiquity/plugins/ubi-timezone.py'
--- ubiquity/plugins/ubi-timezone.py	2012-10-19 17:03:08 +0000
+++ ubiquity/plugins/ubi-timezone.py	2012-11-27 06:10:25 +0000
@@ -97,7 +97,7 @@
             self.controller.allow_go_forward(True)
 
     def changed(self, entry):
-        from gi.repository import Gtk, GObject, Soup
+        from gi.repository import Gtk, GObject, GLib, Soup
 
         text = misc.utf8(self.city_entry.get_text())
         if not text:
@@ -119,9 +119,9 @@
             message.request_headers.append('User-agent', 'Ubiquity/1.0')
             self.geoname_session.abort()
             if self.geoname_timeout_id is not None:
-                GObject.source_remove(self.geoname_timeout_id)
+                GLib.source_remove(self.geoname_timeout_id)
             self.geoname_timeout_id = \
-                GObject.timeout_add_seconds(2, self.geoname_timeout,
+                GLib.timeout_add_seconds(2, self.geoname_timeout,
                                             (text, model))
             self.geoname_session.queue_message(message, self.geoname_cb,
                                                (text, model))
@@ -157,12 +157,12 @@
     def geoname_cb(self, session, message, user_data):
         import syslog
         import json
-        from gi.repository import GObject, Soup
+        from gi.repository import GLib, Soup
 
         text, model = user_data
 
         if self.geoname_timeout_id is not None:
-            GObject.source_remove(self.geoname_timeout_id)
+            GLib.source_remove(self.geoname_timeout_id)
             self.geoname_timeout_id = None
         self.geoname_add_tzdb(text, model)
 
@@ -192,7 +192,7 @@
 
     def setup_page(self):
         # TODO Put a frame around the completion to add contrast (LP: #605908)
-        from gi.repository import Gtk, GObject
+        from gi.repository import Gtk, GLib
         from gi.repository import TimezoneMap
         self.tzdb = ubiquity.tz.Database()
         self.tzmap = TimezoneMap.TimezoneMap()
@@ -207,8 +207,8 @@
 
         def queue_entry_changed(entry):
             if self.timeout_id:
-                GObject.source_remove(self.timeout_id)
-            self.timeout_id = GObject.timeout_add(300, self.changed, entry)
+                GLib.source_remove(self.timeout_id)
+            self.timeout_id = GLib.timeout_add(300, self.changed, entry)
 
         self.city_entry.connect('changed', queue_entry_changed)
         completion = Gtk.EntryCompletion()
 
=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2012-11-22 16:27:21 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2012-11-27 06:10:25 +0000
@@ -405,17 +405,17 @@
 
         if not 'UBIQUITY_AUTOMATIC' in os.environ:
             # Let's not call this every time the user presses a key.
-            from gi.repository import GObject
+            from gi.repository import GLib
             if self.hostname_timeout_id:
-                GObject.source_remove(self.hostname_timeout_id)
-            self.hostname_timeout_id = GObject.timeout_add(
+                GLib.source_remove(self.hostname_timeout_id)
+            self.hostname_timeout_id = GLib.timeout_add(
                 300, self.hostname_timeout, widget)
 
     def lookup_result(self, resolver, result, unused):
-        from gi.repository import GObject
+        from gi.repository import GLib
         try:
             resolver.lookup_by_name_finish(result)
-        except GObject.GError:
+        except GLib.GError:
             pass
         else:
             # FIXME: i18n
@@ -437,10 +437,10 @@
             hostname, None, self.bogus_lookup_result, None)
 
     def bogus_lookup_result(self, resolver, result, unused):
-        from gi.repository import GObject
+        from gi.repository import GLib
         try:
             resolver.lookup_by_name_finish(result)
-        except GObject.GError:
+        except GLib.GError:
             self.resolver_ok = True
         else:
             self.resolver_ok = False