heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use UTC for all timesince comparisons

Browse Source 
Signed-off-by: Jessica Tallon <jessica@megworld.co.uk>
This commit is contained in:
ayleph 2015-03-10 23:55:51 -07:00 committed by Jessica Tallon
parent fc3c8f21a0
commit c975bd3740
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/tests/test_timesince.py
View File

@ -16,7 +16,7 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from mediagoblin.tools.timesince import is_aware, timesince from mediagoblin.tools.timesince import timesince
def test_timesince(): def test_timesince():

14
mediagoblin/tools/timesince.py
View File

@ -33,18 +33,6 @@ import pytz
from mediagoblin.tools.translate import pass_to_ugettext, lazy_pass_to_ungettext as _ from mediagoblin.tools.translate import pass_to_ugettext, lazy_pass_to_ungettext as _
"""UTC time zone as a tzinfo instance."""
utc = pytz.utc if pytz else UTC()
def is_aware(value):
"""
Determines if a given datetime.datetime is aware.
The logic is described in Python's docs:
http://docs.python.org/library/datetime.html#datetime.tzinfo
"""
return value.tzinfo is not None and value.tzinfo.utcoffset(value) is not None
def timesince(d, now=None, reversed=False): def timesince(d, now=None, reversed=False):
""" """
Takes two datetime objects and returns the time between d and now Takes two datetime objects and returns the time between d and now
@ -73,7 +61,7 @@ def timesince(d, now=None, reversed=False):
now = datetime.datetime(now.year, now.month, now.day) now = datetime.datetime(now.year, now.month, now.day)
if not now: if not now:
now = datetime.datetime.now(utc if is_aware(d) else None) now = datetime.datetime.utcnow()
delta = (d - now) if reversed else (now - d) delta = (d - now) if reversed else (now - d)
# ignore microseconds # ignore microseconds