Ibid

Merge lp:~stefanor/ibid/fml-377572 into lp:~ibid-core/ibid/old-trunk-pack-0.92

  1. fml-377572
  2. Merge into old-trunk-pack-0.92
Proposed by Stefano Rivera
Status: Merged
Approved by: Jonathan Hitchcock
Approved revision: 644
Merged at revision: 656
Proposed branch: lp:~stefanor/ibid/fml-377572
Merge into: lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target: None lines
To merge this branch: bzr merge lp:~stefanor/ibid/fml-377572
Reviewer Review Type Date Requested Status
Jonathan Hitchcock Approve
Michael Gorven Approve
Review via email: mp+6907@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

This bug is a sign of something *really* broken at FML. Might as well catch it if it keeps cropping up, though

Revision history for this message
Michael Gorven (mgorven) wrote :

 review approve

review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/lookup.py'
2--- ibid/plugins/lookup.py 2009-05-12 07:13:41 +0000
3+++ ibid/plugins/lookup.py 2009-05-30 18:01:47 +0000
4@@ -1,5 +1,6 @@
5 from urllib2 import urlopen, HTTPError
6 from urllib import urlencode, quote
7+from httplib import BadStatusLine
8 from urlparse import urljoin
9 from time import time
10 from datetime import datetime
11@@ -165,6 +166,9 @@
12 except HTTPError:
13 event.addresponse(choice(self.failure_messages) % event.sender)
14 return
15+ except BadStatusLine:
16+ event.addresponse(choice(self.failure_messages) % event.sender)
17+ return
18
19 if quote:
20 event.addresponse(quote)
21@@ -177,7 +181,8 @@
22 event.addresponse(self.remote_get('random'))
23 except HTTPError:
24 event.addresponse(choice(self.failure_messages) % event.sender)
25- return
26+ except BadStatusLine:
27+ event.addresponse(choice(self.failure_messages) % event.sender)
28
29 @match(r'^fml\s+categories$')
30 def list_categories(self, event):

Subscribers

People subscribed via source and target branches