Changeset 5671

Timestamp:

07/12/07 08:55:19 (1 year ago)

Author:

russellm

Message:

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 <jshaffer2112@gmail.com>.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/utils/dateformat.py (modified) (1 diff)
• django/trunk/django/utils/timesince.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -226 +226 @@
-    scott@staplefish.com
-    serbaut@gmail.com
+    John Shaffer <jshaffer2112@gmail.com>
-    Pete Shinners <pete@shinners.org>
-    Jozko Skrablin <jozko.skrablin@gmail.com>

django/trunk/django/utils/dateformat.py

@@ -228 +228 @@
-            else:
-                j = day_of_year + (7 - weekday) + (jan1_weekday - 1)
-
+/
-                if jan1_weekday > 4:
-                    week_number -= 1

django/trunk/django/utils/timesince.py

@@ -34 +34 @@
-    since = delta.days * 24 * 60 * 60 + delta.seconds
-    for i, (seconds, name) in enumerate(chunks):
-
+/
-        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]
-
+/
-        if count2 != 0:
-            s += ugettext(', %(number)d %(type)s') % {'number': count2, 'type': name2(count2)}