Merge lp:~stefanor/ibid/newtwitter-654535 into lp:~ibid-core/ibid/old-trunk-1.6

Proposed by Stefano Rivera
Status: Merged
Approved by: Max Rabkin
Approved revision: 971
Merged at revision: 976
Proposed branch: lp:~stefanor/ibid/newtwitter-654535
Merge into: lp:~ibid-core/ibid/old-trunk-1.6
Diff against target: 12 lines (+2/-1)
1 file modified
ibid/plugins/social.py (+2/-1)
To merge this branch: bzr merge lp:~stefanor/ibid/newtwitter-654535
Reviewer Review Type Date Requested Status
Max Rabkin Approve
Jonathan Hitchcock Approve
marcog (community) Approve
Review via email: mp+37469@code.launchpad.net

Commit message

Support twitter's new AJAX URLs

To post a comment you must log in.
Revision history for this message
marcog (marco-gallotta) :
review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
Max Rabkin (max-rabkin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/social.py'
2--- ibid/plugins/social.py 2010-09-24 16:49:49 +0000
3+++ ibid/plugins/social.py 2010-10-04 13:46:16 +0000
4@@ -141,7 +141,8 @@
5 'tweet': service['name'],
6 })
7
8- @match(r'^https?://(?:www\.)?twitter\.com/[^/ ]+/statuse?s?/(\d+)$', simple=False)
9+ @match(r'^https?://(?:www\.)?twitter\.com/(?:#!/)?[^/ ]+/statuse?s?/(\d+)$',
10+ simple=False)
11 def twitter(self, event, id):
12 self.update(event, u'twitter', id)
13

Subscribers

People subscribed via source and target branches