Ibid

Merge lp:~stefanor/ibid/microblogging-381967 into lp:~ibid-core/ibid/old-trunk-pack-0.92

  1. microblogging-381967
  2. Merge into old-trunk-pack-0.92
Proposed by Stefano Rivera
Status: Merged
Approved by: Jonathan Hitchcock
Approved revision: 644
Merged at revision: 653
Proposed branch: lp:~stefanor/ibid/microblogging-381967
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/microblogging-381967
Reviewer Review Type Date Requested Status
Jonathan Hitchcock Approve
Michael Gorven Approve
Review via email: mp+6913@code.launchpad.net
To post a comment you must log in.
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 20:13:24 +0000
4@@ -234,7 +234,7 @@
5 try:
6 event.addresponse(u'%(screen_name)s: "%(text)s"', self.remote_update(service, int(id)))
7 except HTTPError, e:
8- if e.code == 403:
9+ if e.code in (401, 403):
10 event.addresponse(u'That %s is private', service['name'])
11 elif e.code == 404:
12 event.addresponse(u'No such %s', service['name'])
13@@ -247,7 +247,9 @@
14 try:
15 event.addresponse(u'"%(text)s" %(ago)s ago, %(url)s', self.remote_latest(service, user))
16 except HTTPError, e:
17- if e.code == 404:
18+ if e.code in (401, 403):
19+ event.addresponse(u"Sorry, %s's feed is private", user)
20+ elif e.code == 404:
21 event.addresponse(u'No such %s', service['user'])
22 else:
23 event.addresponse(u'I can only see the Fail Whale')

Subscribers

People subscribed via source and target branches