Merge lp:~stefanor/ibid/social-typo-722682 into lp:~ibid-core/ibid/old-trunk-1.6

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

Commit message

Typo: parse_timestmap -> parse_timestamp (and remove an unnecessary import)

To post a comment you must log in.
Revision history for this message
marcog (marco-gallotta) :
review: Approve
Revision history for this message
Max Rabkin (max-rabkin) :
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/social.py'
--- ibid/plugins/social.py 2011-01-21 22:21:17 +0000
+++ ibid/plugins/social.py 2011-02-21 16:24:06 +0000
@@ -7,7 +7,6 @@
7import re7import re
8import logging8import logging
99
10import dateutil.parser
11import feedparser10import feedparser
1211
13from ibid.compat import ElementTree12from ibid.compat import ElementTree
@@ -105,7 +104,7 @@
105 return {104 return {
106 'text': decode_htmlentities(latest['text']),105 'text': decode_htmlentities(latest['text']),
107 'ago': ago(datetime.utcnow()106 'ago': ago(datetime.utcnow()
108 - parse_timestmap(latest['created_at'])),107 - parse_timestamp(latest['created_at'])),
109 'url': url,108 'url': url,
110 }109 }
111110

Subscribers

People subscribed via source and target branches