Gwibber

Merge lp:~roignac/gwibber/Bug628686-unblocking-UI into lp:gwibber

  1. Bug628686-unblocking-UI
  2. Merge into trunk
Proposed by Vadim Rutkovsky
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~roignac/gwibber/Bug628686-unblocking-UI
Merge into: lp:gwibber
Diff against target: 13 lines (+3/-1)
1 file modified
gwibber/microblog/dispatcher.py (+3/-1)
To merge this branch: bzr merge lp:~roignac/gwibber/Bug628686-unblocking-UI
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+35893@code.launchpad.net

Description of the change

This branch doesn't block UI with a timeout, catching other exceptions. This should fix those DBus call_blocking() errors

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

I merged a modified version of this, since we don't do anything with the timeout exception anyway we just don't need to call get on it. Curl handles timing out on the network side. Thanks for pointing out where this was!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py 2010-09-17 21:09:41 +0000
+++ gwibber/microblog/dispatcher.py 2010-09-17 21:54:44 +0000
@@ -233,7 +233,9 @@
233233
234 def run(self):234 def run(self):
235 try:235 try:
236 self.pool.map_async(self.func, self.iterable, callback = self.callback).get(timeout = 240)236 self.pool.map_async(self.func, self.iterable, callback = self.callback).get(timeout = 0)
237 except multiprocessing.TimeoutError:
238 pass
237 except Exception as e:239 except Exception as e:
238 self.failure(e, traceback.format_exc())240 self.failure(e, traceback.format_exc())
239241