Merge lp:~xnox/bzr-dbus/pygi into lp:bzr-dbus

[Dimitri John Ledkov]

Remove PyGIDeprecationWarnings

Resolve Bug #1095884: "bzr showing PyGIDeprecationWarning for all actions." by moving from using deprecated interfaces of GObject to undeprecated interfaces of GLib.

[Dimitri John Ledkov (xnox)]

One left:
PyGIDeprecationWarning: Calling io_add_watch with a file object is deprecated; call it with a GLib.IOChannel object

[Martin Pitt (pitti)]

This looks good to me, thanks! Don't worry about the IOChannel warning; I think deprecating this one was a bit overzealous, supporting this mode is not all that expensive (unlike calling it with wrong arguments). I dropped the warning in

http://git.gnome.org/browse/pygobject/commit/?id=945263a8

review: Approve

[Richard Wilbur (richard-wilbur)]

Looks good to me. Thanks for fixing up the code rot by moving bzr-dbus to the blessed interfaces.
+1

review: Approve

[Robert Bruce Park (robru)]

Works for me, too!

review: Approve

[Andrew Starr-Bochicchio (andrewsomething)]

FYI, the fix isn't backwards compatible (not sure if it aims to be). It creates a number of test failures on Debian sid with python-gobject-2, though it might just be time to drop all the 'import glib as GLib' stuff. They also fail with the versions of python-gi in both sid and experimental.

======================================================================
ERROR: bzrlib.plugins.dbus.tests.test_activity.TestLanGateway.test_network_packets_trigger_handle_network_packet
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/tests/test_activity.py", line 516, in test_network_packets_trigger_handle_network_packet
    gateway.run(_port=0)
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/activity.py", line 313, in run
    self.start(_port)
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/activity.py", line 332, in start
    GLib.io_add_watch(self.sock, GLib.PRIORITY_HIGH, GLib.IO_IN, self.handle_network_packet)
TypeError: third argument not callable

======================================================================
ERROR: bzrlib.plugins.dbus.tests.test_activity.TestLanGateway.test_run_binds
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/tests/test_activity.py", line 493, in test_run_binds
    gateway.run(_port=0)
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/activity.py", line 313, in run
    self.start(_port)
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/activity.py", line 332, in start
    GLib.io_add_watch(self.sock, GLib.PRIORITY_HIGH, GLib.IO_IN, self.handle_network_packet)
TypeError: third argument not callable

======================================================================
ERROR: bzrlib.plugins.dbus.tests.test_activity.TestLanGateway.test_run_listens_for_revisions
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/tests/test_activity.py", line 543, in test_run_listens_for_revisions
    gateway.run(_port=0)
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/activity.py", line 313, in run
    self.start(_port)
  File "/tmp/buildd/bzr-dbus-0.1~bzr53/activity.py", line 332, in start
    GLib.io_add_watch(self.sock, GLib.PRIORITY_HIGH, GLib.IO_IN, self.handle_network_packet)
TypeError: third argument not callable

----------------------------------------------------------------------
Ran 37 tests in 1.092s

FAILED (errors=3)

[Robert Bruce Park (robru)]

Andrew, can you try my branch briefly? I ran the testsuite and didn't get the errors you say.

I wrote this a little while ago and don't remember all the details, but I do vaguely remember going into a python2 interactive shell and trying "import glib as GLib" and then poking some of the methods interactively, and seeing that it was working.

https://code.launchpad.net/~robru/bzr-dbus/glib

(also, I think this branch is more complete, as it no longer imports gobject at all)

Thanks!

[Andrew Starr-Bochicchio (andrewsomething)]

Robert,

I was able to successfully run the test suite in a minimal Debian sid chroot using your branch with python-gi installed as well as with only python-gobject-2.

[Richard Wilbur (richard-wilbur)]

On Sun, Jan 27, 2013 at 1:39 PM, Andrew Starr-Bochicchio
<email address hidden> wrote:
> FYI, the fix isn't backwards compatible (not sure if it aims to be). It creates a number of test
> failures on Debian sid with python-gobject-2, though it might just be time to drop all the
> 'import glib as GLib' stuff. They also fail with the versions of python-gi in both sid and experimental.

Andrew,

I must confess that I wasn't looking for backwards compatibility since
we were merging into trunk of bzr-dbus, but if we can have our cake
and eat it too...

So what version of bzr, python, etc. are you testing against?

I thought the original incompatibility this branch intended to fix was
a problem with GObject API deprecation but the test failures you see
complain about GLib usage. Is it due to an older version of GLib, or
possibly something else?

Richard

[Richard Wilbur (richard-wilbur)]

On Sun, Jan 27, 2013 at 2:21 PM, Robert Bruce Park
<email address hidden> wrote:
[...]
> https://code.launchpad.net/~robru/bzr-dbus/glib
>
> (also, I think this branch is more complete, as it no longer imports gobject at all)
[...]

It sounds like this is a better solution than what was previously
merged. Is your branch ready to merge? If so, would you be willing
to propose a merge? I would be happy to approve it.

Sincerely,

Richard

[Robert Bruce Park (robru)]

On Thu, Mar 21, 2013 at 05:55:22AM -0000, Richard Wilbur wrote:
> It sounds like this is a better solution than what was previously
> merged. Is your branch ready to merge? If so, would you be willing
> to propose a merge? I would be happy to approve it.

Ah, I figured the issue was moot at this point. But, since you've
shown an interest, I've rebased my branch on master and submitted a
new mp. Thanks!

=== modified file 'activity.py'
--- activity.py	2012-01-31 20:07:01 +0000
+++ activity.py	2012-11-30 12:43:36 +0000
@@ -27,9 +27,10 @@
 
 import dbus.service
 try:
-    from gi.repository import GObject
+    from gi.repository import GObject, GLib
 except ImportError:
     import gobject as GObject
+    import glib as GLib
 
 from bzrlib.plugins.dbus import mapper
 from bzrlib.revision import NULL_REVISION
@@ -119,7 +120,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
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         def handle_reply():
             # quit our loop.
             mainloop.quit()
@@ -162,7 +163,7 @@
             is ready to handle requests.
         """
         broadcaster = Broadcast(self.bus)
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         if when_ready:
             when_ready()
         mainloop.run()
@@ -239,7 +240,7 @@
         """
         self.bus = _get_bus(bus)
         if mainloop is None:
-            self.mainloop = GObject.MainLoop()
+            self.mainloop = GLib.MainLoop()
         else:
             self.mainloop = mainloop
         if activity is None:
@@ -328,7 +329,7 @@
             self.port = self.sock.getsockname()[1]
         else:
             self.port = _port
-        GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_network_packet)
+        GLib.io_add_watch(self.sock, GLib.PRIORITY_HIGH, GLib.IO_IN, self.handle_network_packet)
         # listen for dbus events
         self.activity.listen_for_revisions(self.catch_dbus_revision)
 

=== modified file 'tests/test_activity.py'
--- tests/test_activity.py	2012-01-31 20:07:01 +0000
+++ tests/test_activity.py	2012-11-30 12:43:36 +0000
@@ -31,10 +31,10 @@
 import dbus.bus
 import dbus.mainloop.glib
 try:
-    from gi.repository import GObject
+    from gi.repository import GObject, GLib
 except ImportError:
     import gobject as GObject
-
+    import glib as GLib
 
 import bzrlib.plugins
 from bzrlib.smart.protocol import _encode_tuple, _decode_tuple
@@ -275,7 +275,7 @@
         dbus_iface.announce_revision('revision2', 'url2',
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -349,7 +349,7 @@
         dbus_iface.announce_revision_urls('revision2', ['url2'],
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -408,7 +408,7 @@
         dbus_iface.add_url_map('foo/', 'baz/',
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -450,7 +450,7 @@
         dbus_iface.remove_url_map('foo/', 'baz/',
             reply_handler=handle_reply,
             error_handler=handle_error)
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         mainloop.run()
         if errors:
             raise errors[0]
@@ -472,7 +472,7 @@
 
     def test_run_binds(self):
         self.error = None
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.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.
@@ -485,8 +485,8 @@
                 except Exception, e:
                     self.error = e
             finally:
-                GObject.timeout_add(0, mainloop.quit)
-        GObject.timeout_add(0, check_socket_bound)
+                GLib.timeout_add(0, mainloop.quit)
+        GLib.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
@@ -495,7 +495,7 @@
             raise self.error
 
     def test_network_packets_trigger_handle_network_packet(self):
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.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():
@@ -503,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)
+        GLib.timeout_add(0, send_packet)
+        GLib.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)
+            GLib.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
@@ -519,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 = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         calls = []
         class StubSocket(object):
@@ -531,8 +531,8 @@
             calls)
 
     def test_run_listens_for_revisions(self):
-        mainloop = GObject.MainLoop()
-        GObject.timeout_add(0, mainloop.quit)
+        mainloop = GLib.MainLoop()
+        GLib.timeout_add(0, mainloop.quit)
         # avoid asking dbus if something is subscribed.
         class StubActivity(object):
             def listen_for_revisions(self, callback):
@@ -545,7 +545,7 @@
 
     def test_catch_dbus_revision_ignore_file_only(self):
         """catch_dbus_revision should ignore file:/// urls."""
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -557,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 = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -572,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 = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -587,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 = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -601,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 = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -618,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 = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         # instrument the transmission apis used by the LanGateway.
         calls = []
@@ -641,7 +641,7 @@
         self.assertTrue(calls[0][1] <= finish)
 
     def test_note_network_revision(self):
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         now = time.time()
         # noting the we've seen 'rev' now should cache it at minute granularity.
@@ -650,7 +650,7 @@
             gateway.seen_revisions)
 
     def test_note_network_revision_trims_cache(self):
-        mainloop = GObject.MainLoop()
+        mainloop = GLib.MainLoop()
         gateway = activity.LanGateway(self.bus, mainloop)
         now = time.time()
         # noting a time when there are stale entries should remove them.
@@ -666,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 = GLib.MainLoop()
         # instrument the transmission apis used by the LanGateway.
         calls = []
         start = time.time()