From 34655a3e7816d6a8e5da6b3fd613b49b454a4691 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Thu, 12 Jul 2007 13:55:19 +0000 Subject: [PATCH] Fixed #4768 -- Converted timesince and dateformat to use explicit floor division (pre-emptive avoidance of Python 3000 compatibility problem), and removed a redundant millisecond check. Thanks, John Shaffer . git-svn-id: http://code.djangoproject.com/svn/django/trunk@5671 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 1 + django/utils/dateformat.py | 2 +- django/utils/timesince.py | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index b32fe163bc..ee1b0a4609 100644 --- a/AUTHORS +++ b/AUTHORS @@ -225,6 +225,7 @@ answer newbie questions, and generally made Django that much better: David Schein scott@staplefish.com serbaut@gmail.com + John Shaffer Pete Shinners Jozko Skrablin SmileyChris diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index 8a90e21cb1..d5f3499d82 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -227,7 +227,7 @@ class DateFormat(TimeFormat): week_number = 1 else: j = day_of_year + (7 - weekday) + (jan1_weekday - 1) - week_number = j / 7 + week_number = j // 7 if jan1_weekday > 4: week_number -= 1 return week_number diff --git a/django/utils/timesince.py b/django/utils/timesince.py index 8ecf970439..455788e7d7 100644 --- a/django/utils/timesince.py +++ b/django/utils/timesince.py @@ -33,16 +33,14 @@ def timesince(d, now=None): delta = now - (d - datetime.timedelta(0, 0, d.microsecond)) since = delta.days * 24 * 60 * 60 + delta.seconds for i, (seconds, name) in enumerate(chunks): - count = since / seconds + count = since // seconds if count != 0: break - if count < 0: - return ugettext('%d milliseconds') % math.floor((now - d).microseconds / 1000) s = ugettext('%(number)d %(type)s') % {'number': count, 'type': name(count)} if i + 1 < len(chunks): # Now get the second item seconds2, name2 = chunks[i + 1] - count2 = (since - (seconds * count)) / seconds2 + count2 = (since - (seconds * count)) // seconds2 if count2 != 0: s += ugettext(', %(number)d %(type)s') % {'number': count2, 'type': name2(count2)} return s