Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4768 -- Converted timesince and dateformat to use explicit flo…

…or division (pre-emptive avoidance of Python 3000 compatibility problem), and removed a redundant millisecond check. Thanks, John Shaffer <jshaffer2112@gmail.com>.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 34655a3e7816d6a8e5da6b3fd613b49b454a4691 1 parent 1345f3c
@freakboy3742 freakboy3742 authored
View
1  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 <jshaffer2112@gmail.com>
Pete Shinners <pete@shinners.org>
Jozko Skrablin <jozko.skrablin@gmail.com>
SmileyChris <smileychris@gmail.com>
View
2  django/utils/dateformat.py
@@ -227,7 +227,7 @@ def W(self):
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
View
6 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

0 comments on commit 34655a3

Please sign in to comment.
Something went wrong with that request. Please try again.