diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-07 21:21:17 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-07 21:21:17 +0000 |
| commit | 866574a85442a0310fbc2bf06b6fbf1d759d1479 (patch) | |
| tree | f2d266ec935f7462beb20f43dafb6f5ae3efacb5 /django | |
| parent | 8c763da4f76fe9c04734cce4325a8b0fd06617b8 (diff) | |
[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
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/syndication/feeds.py | 2 |
1 files changed, 1 insertions, 1 deletions
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() |