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

[Stefano Rivera]

URLErrors have reasons, but there are other HTTPErrors

Looks like we merged a bug. URLErrors have reasons, but there are other HTTPErrors

[lp:~stefanor/ibid/twitter-ratelimit-670855]

912. By Stefano Rivera on 2011-01-20

Actually, we want a little more

[Max Rabkin (max-rabkin)]

review: Approve

[marcog (marco-gallotta)]

review: Approve

=== modified file 'ibid/plugins/social.py'
--- ibid/plugins/social.py	2011-01-19 19:21:03 +0000
+++ ibid/plugins/social.py	2011-01-20 16:29:47 +0000
@@ -120,8 +120,7 @@
             elif e.code == 404:
                 event.addresponse(u'No such %s', service['name'])
             else:
-                log.debug(u'%s returned HTTP code %i: %s', service['name'],
-                          e.code, e.reason)
+                log.debug(u'%s raised %s', service['name'], unicode(e))
                 event.addresponse(u'I can only see the Fail Whale')
 
     @handler
@@ -135,8 +134,7 @@
             elif e.code == 404:
                 event.addresponse(u'No such %s', service['user'])
             else:
-                log.debug(u'%s returned HTTP code %i: %s', service['name'],
-                          e.code, e.reason)
+                log.debug(u'%s raised %s', service['name'], unicode(e))
                 event.addresponse(u'I can only see the Fail Whale')
         except self.NoTweetsException, e:
             event.addresponse(