Merge lp:~stefanor/ibid/twitter-ratelimit-670855 into lp:~ibid-core/ibid/old-release-0.1-1.6

Proposed by Stefano Rivera
Status: Merged
Approved by: Stefano Rivera
Approved revision: 912
Merged at revision: 971
Proposed branch: lp:~stefanor/ibid/twitter-ratelimit-670855
Merge into: lp:~ibid-core/ibid/old-release-0.1-1.6
Diff against target: 23 lines (+2/-4)
1 file modified
ibid/plugins/social.py (+2/-4)
To merge this branch: bzr merge lp:~stefanor/ibid/twitter-ratelimit-670855
Reviewer Review Type Date Requested Status
marcog (community) Approve
Max Rabkin Approve
Review via email: mp+46905@code.launchpad.net

Commit message

URLErrors have reasons, but there are other HTTPErrors

To post a comment you must log in.
912. By Stefano Rivera

Actually, we want a little more

Revision history for this message
Max Rabkin (max-rabkin) :
review: Approve
Revision history for this message
marcog (marco-gallotta) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ibid/plugins/social.py'
--- ibid/plugins/social.py 2011-01-19 19:22:40 +0000
+++ ibid/plugins/social.py 2011-01-20 16:29:31 +0000
@@ -120,8 +120,7 @@
120 elif e.code == 404:120 elif e.code == 404:
121 event.addresponse(u'No such %s', service['name'])121 event.addresponse(u'No such %s', service['name'])
122 else:122 else:
123 log.debug(u'%s returned HTTP code %i: %s', service['name'],123 log.debug(u'%s raised %s', service['name'], unicode(e))
124 e.code, e.reason)
125 event.addresponse(u'I can only see the Fail Whale')124 event.addresponse(u'I can only see the Fail Whale')
126125
127 @handler126 @handler
@@ -135,8 +134,7 @@
135 elif e.code == 404:134 elif e.code == 404:
136 event.addresponse(u'No such %s', service['user'])135 event.addresponse(u'No such %s', service['user'])
137 else:136 else:
138 log.debug(u'%s returned HTTP code %i: %s', service['name'],137 log.debug(u'%s raised %s', service['name'], unicode(e))
139 e.code, e.reason)
140 event.addresponse(u'I can only see the Fail Whale')138 event.addresponse(u'I can only see the Fail Whale')
141 except self.NoTweetsException, e:139 except self.NoTweetsException, e:
142 event.addresponse(140 event.addresponse(

Subscribers

People subscribed via source and target branches