Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #977 -- Fixed timesince() utility. Thanks, pgross@thoughtworks.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f6b90c8c2a8f1b3cea7bf9addbb041d3f1667511 1 parent d06a124
Adrian Holovaty adrianholovaty authored
Showing with 5 additions and 4 deletions.
  1. +2 −1  AUTHORS
  2. +3 −3 django/utils/timesince.py
3  AUTHORS
View
@@ -75,8 +75,9 @@ answer newbie questions, and generally made Django that much better:
Robin Munn <http://www.geekforgod.com/>
Nebojša Dorđević
Sam Newman <http://www.magpiebrain.com/>
- Luke Plant <http://lukeplant.me.uk/>
+ pgross@thoughtworks.com
phaedo <http://phaedo.cx/>
+ Luke Plant <http://lukeplant.me.uk/>
plisk
Oliver Rutherfurd <http://rutherfurd.net/>
David Schein
6 django/utils/timesince.py
View
@@ -4,7 +4,7 @@
def timesince(d, now=None):
"""
- Takes a datetime object, returns the time between then and now
+ Takes two datetime objects and returns the time between then and now
as a nicely formatted string, e.g "10 minutes"
Adapted from http://blog.natbat.co.uk/archive/2003/Jun/14/time_since
"""
@@ -16,7 +16,7 @@ def timesince(d, now=None):
(60, lambda n: ngettext('minute', 'minutes', n))
)
if now:
- t = time.mktime(now)
+ t = now.timetuple()
else:
t = time.localtime()
if d.tzinfo:
@@ -47,4 +47,4 @@ def timeuntil(d):
the given time.
"""
now = datetime.datetime.now()
- return timesince(now, time.mktime(d.timetuple()))
+ return timesince(now, d)
Please sign in to comment.
Something went wrong with that request. Please try again.