Merge pull request #156 from Natim/master

GTM Time in ATOM feeds

pelican/utils.py

@@ -2,6 +2,9 @@
 import re
 import os
 import shutil
+import time
+import calendar
+import pytz
 from datetime import datetime
 from codecs import open as _open
 from itertools import groupby
@@ -222,3 +225,13 @@ def files_changed(path, extensions):
         LAST_MTIME = mtime
         return True
     return False
+
+def set_date_tzinfo(d, tz_name=None):
+    """ Date without tzinfo shoudbe utc.
+    This function set the right tz to date that aren't utc and don't have tzinfo
+    """
+    if tz_name is not None:
+        tz = pytz.timezone(tz_name)
+        return tz.localize(d)
+    else:
+        return d

pelican/writers.py

@@ -7,7 +7,7 @@ from functools import partial
 import locale
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
-from pelican.utils import get_relative_path
+from pelican.utils import get_relative_path, set_date_tzinfo
 from pelican.paginator import Paginator
 from pelican.log import *
 
@@ -37,7 +37,8 @@ class Writer(object):
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', 'John Doe'),
-            pubdate=item.date)
+            pubdate=set_date_tzinfo(item.date, 
+                                    self.settings.get('TIMEZONE', None)))
 
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided