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
=== modified file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py 2009-05-12 07:13:41 +0000
+++ ibid/plugins/lookup.py 2009-05-30 18:01:47 +0000
@@ -1,5 +1,6 @@
1from urllib2 import urlopen, HTTPError1from urllib2 import urlopen, HTTPError
2from urllib import urlencode, quote2from urllib import urlencode, quote
3from httplib import BadStatusLine
3from urlparse import urljoin4from urlparse import urljoin
4from time import time5from time import time
5from datetime import datetime6from datetime import datetime
@@ -165,6 +166,9 @@
165 except HTTPError:166 except HTTPError:
166 event.addresponse(choice(self.failure_messages) % event.sender)167 event.addresponse(choice(self.failure_messages) % event.sender)
167 return168 return
169 except BadStatusLine:
170 event.addresponse(choice(self.failure_messages) % event.sender)
171 return
168172
169 if quote:173 if quote:
170 event.addresponse(quote)174 event.addresponse(quote)
@@ -177,7 +181,8 @@
177 event.addresponse(self.remote_get('random'))181 event.addresponse(self.remote_get('random'))
178 except HTTPError:182 except HTTPError:
179 event.addresponse(choice(self.failure_messages) % event.sender)183 event.addresponse(choice(self.failure_messages) % event.sender)
180 return184 except BadStatusLine:
185 event.addresponse(choice(self.failure_messages) % event.sender)
181186
182 @match(r'^fml\s+categories$')187 @match(r'^fml\s+categories$')
183 def list_categories(self, event):188 def list_categories(self, event):

Subscribers

People subscribed via source and target branches