Merge lp:~sinzui/bzr-dbus/gtk3-support into lp:bzr-dbus

[Curtis Hovey]

Update bzr-dbus to work with gtk3.

I see this error when I run gci from the command line or from
gedit-developer-plugins:

/usr/lib/python2.7/dist-packages/gobject/constants.py:24:
    Warning: g_boxed_type_register_static:
        assertion `g_type_from_name (name) == 0' failed
  import gobject._gobject

This is harmless from the command line, but when the code is embedded,
the whole app becomes unstable and is likely to crash the next time any
call to bzr-gtk is made.

I traced the issue to an import of gobject in bzr-dbus:

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 919, in exception_to_return_code
...
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/dbus/activity.py", line 29, in <module>
    import gobject
  File "/usr/lib/python2.7/dist-packages/gobject/__init__.py", line 47, in <module>
    from gobject.constants import *

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

RULES

    * Try to import from gi.repository and fallback for gobject.
    * Update the existing calls to gobject to use GObject, the
      three member calls are compatible with GObject.
    * ADDENDUM
      * Added a 'check' command to setup.py to run the tests
      * tests.test_activity.TestActivity.test_server fails in
        trunk and my branch. I do not know what I can do to fix
        the test or the code to make it pass. The server fails to
        start.`

QA

    * Using bzr-gtk trunk run `bzr gci` in a tree with changes.
    * Verify a warnging is not displayed on the commmand line
      Warning: g_boxed_type_register_static: ...

TEST

    ./setup.py check

[Jelmer Vernooij (jelmer)]

Thanks again Curtis!

review: Approve

=== modified file 'activity.py'
--- activity.py	2008-02-13 00:29:52 +0000
+++ activity.py	2012-01-31 21:03:29 +0000
@@ -26,7 +26,10 @@
 import time
 
 import dbus.service
-import gobject
+try:
+    from gi.repository import GObject
+except ImportError:
+    import gobject as GObject
 
 from bzrlib.plugins.dbus import mapper
 from bzrlib.revision import NULL_REVISION
@@ -116,8 +119,7 @@
         # make a non-blocking call, which we can then ignore as we dont
         # care about responses: Apparently there is some dbus foo to help
         # make this not need the stub function
-        import gobject
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         def handle_reply():
             # quit our loop.
             mainloop.quit()
@@ -160,7 +162,7 @@
             is ready to handle requests.
         """
         broadcaster = Broadcast(self.bus)
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         if when_ready:
             when_ready()
         mainloop.run()
@@ -237,7 +239,7 @@
         """
         self.bus = _get_bus(bus)
         if mainloop is None:
-            self.mainloop = gobject.MainLoop()
+            self.mainloop = GObject.MainLoop()
         else:
             self.mainloop = mainloop
         if activity is None:
@@ -326,7 +328,7 @@
             self.port = self.sock.getsockname()[1]
         else:
             self.port = _port
-        gobject.io_add_watch(self.sock, gobject.IO_IN, self.handle_network_packet)
+        GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_network_packet)
         # listen for dbus events
         self.activity.listen_for_revisions(self.catch_dbus_revision)
 

=== modified file 'setup.py'
--- setup.py	2010-03-01 05:04:36 +0000
+++ setup.py	2012-01-31 21:03:29 +0000
@@ -1,16 +1,44 @@
-#!/usr/bin/env python2.4
-from distutils.core import setup
+#!/usr/bin/env python
+
+from distutils.core import (
+    Command,
+    setup,
+    )
+import subprocess
+import sys
+
+
+class Check(Command):
+    description = "run all tests or a single test module"
+    user_options = [
+        ('module=', 'm', 'The test module to run'),
+        ]
+
+    def initialize_options(self):
+        self.module = 'discover'
+
+    def finalize_options(self):
+        self.module = [self.module]
+
+    def run(self):
+        command = [sys.executable, '-m', 'testtools.run']
+        command += self.module
+        raise SystemExit(subprocess.call(command))
+
+
 if __name__ == '__main__':
     setup(name="bzr-dbus",
       version="0.1~",
       description="dbus core plugin for bzr.",
       author="Robert Collins",
       author_email="[e-mail]",
-      license = "GPLV2",
+      license="GPLV2",
       url="https://launchpad.net/bzr-dbus",
       data_files=[('share/dbus-1/services',
           ['org.bazaarvcs.plugins.dbus.Broadcast.service'])],
       packages=['bzrlib.plugins.dbus',
                 'bzrlib.plugins.dbus.tests',
                 ],
-      package_dir={'bzrlib.plugins.dbus': '.'})
+      package_dir={'bzrlib.plugins.dbus': '.'},
+      cmdclass={'check': Check},
+      )

=== modified file 'tests/test_activity.py'
--- tests/test_activity.py	2011-07-19 12:17:37 +0000
+++ tests/test_activity.py	2012-01-31 21:03:29 +0000
@@ -30,7 +30,11 @@
 import dbus
 import dbus.bus
 import dbus.mainloop.glib
-import gobject
+try:
+    from gi.repository import GObject
+except ImportError:
+    import gobject as GObject
+
 
 import bzrlib.plugins
 from bzrlib.smart.protocol import _encode_tuple, _decode_tuple
@@ -271,7 +275,7 @@
         dbus_iface.announce_revision('revision2', 'url2',
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -345,7 +349,7 @@
         dbus_iface.announce_revision_urls('revision2', ['url2'],
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -404,7 +408,7 @@
         dbus_iface.add_url_map('foo/', 'baz/',
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -446,7 +450,7 @@
         dbus_iface.remove_url_map('foo/', 'baz/',
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -468,7 +472,7 @@
 
     def test_run_binds(self):
         self.error = None
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         # we want run to: open a listening socket on localhost:4155 udp, the
         # bzr protocol port number.
         # to test this we want to check the port is in use during the loop.
@@ -481,8 +485,8 @@
                 except Exception, e:
                     self.error = e
             finally:
-                gobject.timeout_add(0, mainloop.quit)
-        gobject.timeout_add(0, check_socket_bound)
+                GObject.timeout_add(0, mainloop.quit)
+        GObject.timeout_add(0, check_socket_bound)
         gateway = activity.LanGateway(self.bus, mainloop)
         # disable talking to dbus by making it a noop
         gateway.activity.listen_for_revisions = lambda x:x
@@ -491,7 +495,7 @@
             raise self.error
 
     def test_network_packets_trigger_handle_network_packet(self):
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         # we want network packets to call handle_network_packet,
         # so we override that to shutdown the mainloop and log the call.
         def send_packet():
@@ -499,13 +503,13 @@
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
             sock.sendto('data_to_handle', ('127.0.0.1', gateway.port))
             sock.close()
-        gobject.timeout_add(0, send_packet)
-        gobject.timeout_add(1000, mainloop.quit)
+        GObject.timeout_add(0, send_packet)
+        GObject.timeout_add(1000, mainloop.quit)
         gateway = activity.LanGateway(self.bus, mainloop)
         calls = []
         def handle_data(data):
             calls.append(('handle', data))
-            gobject.timeout_add(0, mainloop.quit)
+            GObject.timeout_add(0, mainloop.quit)
         gateway.handle_network_data = handle_data
         # disable talking to dbus by making it a noop
         gateway.activity.listen_for_revisions = lambda x:x
@@ -515,7 +519,7 @@
     def test_broadcast_data_calls_sock(self):
         # the method broadcast_data on a LanGateway should invoke
         # socket.sendto(data, ('<broadcast>', 4155))
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         calls = []
         class StubSocket(object):
@@ -527,8 +531,8 @@
             calls)
 
     def test_run_listens_for_revisions(self):
-        mainloop = gobject.MainLoop()
-        gobject.timeout_add(0, mainloop.quit)
+        mainloop = GObject.MainLoop()
+        GObject.timeout_add(0, mainloop.quit)
         # avoid asking dbus if something is subscribed.
         class StubActivity(object):
             def listen_for_revisions(self, callback):
@@ -541,7 +545,7 @@
 
     def test_catch_dbus_revision_ignore_file_only(self):
         """catch_dbus_revision should ignore file:/// urls."""
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -553,7 +557,7 @@
 
     def test_catch_dbus_revision_strip_file(self):
         """catch_dbus_revision should strip file:/// urls if others exist."""
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -568,7 +572,7 @@
 
     def test_catch_dbus_revision_encodes_smart_tuple(self):
         """catch_dbus_revision should encode as _encode_tuple does."""
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -583,7 +587,7 @@
 
     def test_catch_dbus_revision_ignores_revision_url_all_from_network(self):
         """There is a time limited window within which revisions are remembered."""
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -597,7 +601,7 @@
 
     def test_catch_dbus_revision_preserves_non_network_urls(self):
         """When some urls for a revision were not from the network the rest are sent."""
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -614,7 +618,7 @@
 
     def test_catch_dbus_revision_notes_revision(self):
         """Revisions coming in from dbus are noted too, to prevent reemission."""
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -637,7 +641,7 @@
         self.assertTrue(calls[0][1] <= finish)
 
     def test_note_network_revision(self):
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         now = time.time()
         # noting the we've seen 'rev' now should cache it at minute granularity.
@@ -646,7 +650,7 @@
             gateway.seen_revisions)
 
     def test_note_network_revision_trims_cache(self):
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         now = time.time()
         # noting a time when there are stale entries should remove them.
@@ -662,7 +666,7 @@
     def test_handle_network_data(self):
         """data from the network is deserialised, passed to note_revision and dbus."""
 
-        mainloop = gobject.MainLoop()
+        mainloop = GObject.MainLoop()
         # instrument the transmission apis used by the LanGateway.
         calls = []
         start = time.time()