From 866574a85442a0310fbc2bf06b6fbf1d759d1479 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 7 Apr 2009 21:21:17 +0000 Subject: [1.0.X] Fixed #9957: feeds now respect time zone information provided by the pub date. Backport of r10435 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10436 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/syndication/feeds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') diff --git a/django/contrib/syndication/feeds.py b/django/contrib/syndication/feeds.py index 15513faa35..ade43d7cff 100644 --- a/django/contrib/syndication/feeds.py +++ b/django/contrib/syndication/feeds.py @@ -145,7 +145,7 @@ class Feed(object): author_email = author_link = None pubdate = self.__get_dynamic_attr('item_pubdate', item) - if pubdate: + if pubdate and not pubdate.tzinfo: now = datetime.now() utcnow = datetime.utcnow() -- cgit v1.3