github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1525 from tonyseek/fixup-timezone-comparison

Browse source 
Fix a datetime comparison error related to time zones
This commit is contained in:
Justin Mayer 2014-12-11 08:19:33 -08:00
commit 7e961061e1
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pelican/contents.py
View file

@ -11,6 +11,7 @@ import os
import re import re
import sys import sys
import pytz
from pelican import signals from pelican import signals
from pelican.settings import DEFAULT_CONFIG from pelican.settings import DEFAULT_CONFIG
@ -132,8 +133,12 @@ class Content(object):
# manage status # manage status
if not hasattr(self, 'status'): if not hasattr(self, 'status'):
self.status = settings['DEFAULT_STATUS'] self.status = settings['DEFAULT_STATUS']
if not settings['WITH_FUTURE_DATES']: if not settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
if hasattr(self, 'date') and self.date > SafeDatetime.now(): if self.date.tzinfo is None:
now = SafeDatetime.now()
else:
now = SafeDatetime.utcnow().replace(tzinfo=pytz.utc)
if self.date > now:
self.status = 'draft' self.status = 'draft'
# store the summary metadata if it is set # store the summary metadata if it is set