desktopcouch

Merge lp:~cmiller/desktopcouch/no-returns-in-finally into lp:desktopcouch

  1. no-returns-in-finally
  2. Merge into trunk
Proposed by Chad Miller
Status: Merged
Approved by: John O'Brien
Approved revision: 278
Merged at revision: 278
Proposed branch: lp:~cmiller/desktopcouch/no-returns-in-finally
Merge into: lp:desktopcouch
Diff against target: 8 lines (+0/-1)
1 file modified
desktopcouch/application/service.py (+0/-1)
To merge this branch: bzr merge lp:~cmiller/desktopcouch/no-returns-in-finally
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
John O'Brien (community) Approve
dobey (community) Approve
Review via email: mp+68600@code.launchpad.net

Commit message

Fix one path of a service, where an exception should be received by the calling function (main, except for tests), and since we return out of the finally-block, there's no exception to send. This would make tests very hard to debug when there was a failure.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
John O'Brien (jdobrien) wrote :

Easy

review: Approve
Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktopcouch/application/service.py'
2--- desktopcouch/application/service.py 2011-04-25 15:26:07 +0000
3+++ desktopcouch/application/service.py 2011-07-20 20:39:29 +0000
4@@ -222,4 +222,3 @@
5 logging.warn("Sent SIGKILL to %d", child_pid)
6 except OSError:
7 pass
8- return # pylint: disable=W0150

Subscribers

People subscribed via source and target branches