Gwibber

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

  1. Bug628686-unblocking-UI
  2. Merge into trunk
Proposed by Vadim Rutkovsky on 2010-09-17
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 2010-09-17 Approve on 2010-09-22
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.
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
1=== modified file 'gwibber/microblog/dispatcher.py'
2--- gwibber/microblog/dispatcher.py 2010-09-17 21:09:41 +0000
3+++ gwibber/microblog/dispatcher.py 2010-09-17 21:54:44 +0000
4@@ -233,7 +233,9 @@
5
6 def run(self):
7 try:
8- self.pool.map_async(self.func, self.iterable, callback = self.callback).get(timeout = 240)
9+ self.pool.map_async(self.func, self.iterable, callback = self.callback).get(timeout = 0)
10+ except multiprocessing.TimeoutError:
11+ pass
12 except Exception as e:
13 self.failure(e, traceback.format_exc())
14

Subscribers

People subscribed via source and target branches