diff options
| -rw-r--r-- | mediagoblin/tests/test_timesince.py | 2 | ||||
| -rw-r--r-- | mediagoblin/tools/timesince.py | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/mediagoblin/tests/test_timesince.py b/mediagoblin/tests/test_timesince.py index 6579eb09..99ae31da 100644 --- a/mediagoblin/tests/test_timesince.py +++ b/mediagoblin/tests/test_timesince.py @@ -16,7 +16,7 @@ from datetime import datetime, timedelta -from mediagoblin.tools.timesince import is_aware, timesince +from mediagoblin.tools.timesince import timesince def test_timesince(): diff --git a/mediagoblin/tools/timesince.py b/mediagoblin/tools/timesince.py index b761c1be..7a8b3ff0 100644 --- a/mediagoblin/tools/timesince.py +++ b/mediagoblin/tools/timesince.py @@ -33,18 +33,6 @@ import pytz 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): """ 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) 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) # ignore microseconds |