Merge lp:~stefanor/ibid/twitter-timestamp-702815-0.1 into lp:~ibid-core/ibid/old-release-0.1-1.6

[Stefano Rivera]

Add parse_timestamp function to ibid.utils, use for parsing timestamps from Twitter.

[lp:~stefanor/ibid/twitter-timestamp-702815-0.1]

967. By Stefano Rivera on 2011-01-15

Bump copyright years

[Max Rabkin (max-rabkin)]

review: Approve

[lp:~stefanor/ibid/twitter-timestamp-702815-0.1]

968. By Stefano Rivera on 2011-01-21

Clarify that parse_timestamp is for machine timestamps

[marcog (marco-gallotta)]

review: Approve

=== modified file 'COPYING'
--- COPYING	2010-01-19 11:41:20 +0000
+++ COPYING	2011-01-21 21:23:42 +0000
@@ -22,7 +22,7 @@
 Ibid Core Licence:
 ==================
 
-Copyright © 2008-2010: Jonathan Hitchcock, Michael Gorven, Stefano Rivera and
+Copyright © 2008-2011: Jonathan Hitchcock, Michael Gorven, Stefano Rivera and
                        other contributors.
 All rights reserved.
 
@@ -48,7 +48,7 @@
 Ibid Package License:
 =====================
 
-Copyright © 2008-2010: The Ibid developers and contributors.
+Copyright © 2008-2011: The Ibid developers and contributors.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

=== modified file 'docs/api/ibid.utils.rst'
--- docs/api/ibid.utils.rst	2011-01-12 14:16:31 +0000
+++ docs/api/ibid.utils.rst	2011-01-21 21:23:42 +0000
@@ -46,6 +46,15 @@
       >>> format_date(datetime.utcnow())
       u'2009-12-14 12:41:55 SAST'
 
+.. function:: parse_timestamp(timestamp)
+
+   Parse string *timestamp*, convert it to UTC, and strip the timezone.
+
+   This function is good at parsing machine timestamps, but can't handle
+   "human" times very well. (It uses :mod:`dateutil.parser`)
+
+   Return a naive :class:`datetime.datetime`.
+
 .. function:: human_join(items, [separator=u',', conjunction=u'and'])
 
    Turn iterable *items* into a unicode list in the format ``a, b, c

=== modified file 'docs/conf.py'
--- docs/conf.py	2010-03-09 20:44:39 +0000
+++ docs/conf.py	2011-01-21 21:23:42 +0000
@@ -38,7 +38,7 @@
 
 # General information about the project.
 project = u'Ibid'
-copyright = u'2008-2010, The Ibid Developers'
+copyright = u'2008-2011, The Ibid Developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

=== modified file 'ibid/plugins/social.py'
--- ibid/plugins/social.py	2011-01-19 19:22:40 +0000
+++ ibid/plugins/social.py	2011-01-21 21:23:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2010, Michael Gorven, Stefano Rivera, Jonathan Hitchcock
+# Copyright (c) 2008-2011, Michael Gorven, Stefano Rivera, Jonathan Hitchcock
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 from urllib2 import HTTPError
@@ -7,13 +7,14 @@
 import re
 import logging
 
+import dateutil.parser
 import feedparser
 
-from ibid.compat import dt_strptime, ElementTree
+from ibid.compat import ElementTree
 from ibid.config import DictOption
 from ibid.plugins import Processor, match, handler
 from ibid.utils import ago, decode_htmlentities, generic_webservice, \
-                       json_webservice
+                       json_webservice, parse_timestamp
 
 log = logging.getLogger('plugins.social')
 features = {}
@@ -35,7 +36,7 @@
         else:
             event.addresponse(u', '.join(u'%s (%s ago)' % (
                     e.title,
-                    ago(event.time - dt_strptime(e.updated, '%a, %d %b %Y %H:%M:%S +0000'), 1)
+                    ago(event.time - parse_timestamp(e.updated))
                 ) for e in songs['entries']))
 
 features['microblog'] = {
@@ -84,9 +85,8 @@
             return {
                 'text': latest.findtext('{http://www.w3.org/2005/Atom}content')
                         .split(': ', 1)[1],
-                'ago': ago(datetime.utcnow() - dt_strptime(
-                    latest.findtext('{http://www.w3.org/2005/Atom}published'),
-                    '%Y-%m-%dT%H:%M:%S+00:00')),
+                'ago': ago(datetime.utcnow() - parse_timestamp(
+                    latest.findtext('{http://www.w3.org/2005/Atom}published'))),
                 'url': [x for x
                      in latest.getiterator('{http://www.w3.org/2005/Atom}link')
                      if x.get('type') == 'text/html'
@@ -104,8 +104,8 @@
 
         return {
             'text': decode_htmlentities(latest['text']),
-            'ago': ago(datetime.utcnow() - dt_strptime(latest['created_at'],
-                   '%a %b %d %H:%M:%S +0000 %Y')),
+            'ago': ago(datetime.utcnow()
+                       - parse_timestmap(latest['created_at'])),
             'url': url,
         }
 

=== modified file 'ibid/utils/__init__.py'
--- ibid/utils/__init__.py	2011-01-12 14:16:31 +0000
+++ ibid/utils/__init__.py	2011-01-21 21:23:42 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010, Michael Gorven, Stefano Rivera
+# Copyright (c) 2009-2011, Michael Gorven, Stefano Rivera
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 import codecs
@@ -19,6 +19,7 @@
 import zlib
 from subprocess import Popen, PIPE
 
+import dateutil.parser
 from dateutil.tz import tzlocal, tzutc
 from pkg_resources import resource_exists, resource_filename
 
@@ -187,6 +188,14 @@
 
     return unicode(timestamp.strftime(format.encode('utf8')), 'utf8')
 
+def parse_timestamp(timestamp):
+    "Parse a machine timestamp, convert to UTC, strip timezone"
+    dt = dateutil.parser.parse(timestamp)
+    if dt.tzinfo:
+        dt = dt.astimezone(tzutc())
+        dt = dt.replace(tzinfo=None)
+    return dt
+
 class JSONException(Exception):
     pass