Author: Alex
Date: 2011-09-09 14:45:58 -0700 (Fri, 09 Sep 2011)
New Revision: 16745
Modified:
django/trunk/django/contrib/humanize/templatetags/humanize.py
django/trunk/django/contrib/localflavor/se/utils.py
django/trunk/django/utils/baseconv.py
django/trunk/django/utils/feedgenerator.py
django/trunk/django/utils/http.py
Log:
Switch to using explicit new-style division behavior, rather than relying on
teh classic behavior.
Modified: django/trunk/django/contrib/humanize/templatetags/humanize.py
===================================================================
--- django/trunk/django/contrib/humanize/templatetags/humanize.py
2011-09-09 21:43:11 UTC (rev 16744)
+++ django/trunk/django/contrib/humanize/templatetags/humanize.py
2011-09-09 21:45:58 UTC (rev 16745)
@@ -165,13 +165,13 @@
return ungettext(
u'a second ago', u'%(count)s seconds ago', delta.seconds
) % {'count': delta.seconds}
- elif delta.seconds / 60 < 60:
- count = delta.seconds / 60
+ elif delta.seconds // 60 < 60:
+ count = delta.seconds // 60
return ungettext(
u'a minute ago', u'%(count)s minutes ago', count
) % {'count': count}
else:
- count = delta.seconds / 60 / 60
+ count = delta.seconds // 60 // 60
return ungettext(
u'an hour ago', u'%(count)s hours ago', count
) % {'count': count}
@@ -187,13 +187,13 @@
return ungettext(
u'a second from now', u'%(count)s seconds from now',
delta.seconds
) % {'count': delta.seconds}
- elif delta.seconds / 60 < 60:
- count = delta.seconds / 60
+ elif delta.seconds // 60 < 60:
+ count = delta.seconds // 60
return ungettext(
u'a minute from now', u'%(count)s minutes from now', count
) % {'count': count}
else:
- count = delta.seconds / 60 / 60
+ count = delta.seconds // 60 // 60
return ungettext(
u'an hour from now', u'%(count)s hours from now', count
) % {'count': count}
Modified: django/trunk/django/contrib/localflavor/se/utils.py
===================================================================
--- django/trunk/django/contrib/localflavor/se/utils.py 2011-09-09 21:43:11 UTC
(rev 16744)
+++ django/trunk/django/contrib/localflavor/se/utils.py 2011-09-09 21:45:58 UTC
(rev 16745)
@@ -18,7 +18,7 @@
if (s % 10) == 0:
return 0
- return (((s / 10) + 1) * 10) - s
+ return (((s // 10) + 1) * 10) - s
def validate_id_birthday(gd, fix_coordination_number_day=True):
"""
Modified: django/trunk/django/utils/baseconv.py
===================================================================
--- django/trunk/django/utils/baseconv.py 2011-09-09 21:43:11 UTC (rev
16744)
+++ django/trunk/django/utils/baseconv.py 2011-09-09 21:45:58 UTC (rev
16745)
@@ -88,7 +88,7 @@
while x > 0:
digit = x % len(to_digits)
res = to_digits[digit] + res
- x = int(x / len(to_digits))
+ x = int(x // len(to_digits))
return neg, res
base2 = BaseConverter(BASE2_ALPHABET)
Modified: django/trunk/django/utils/feedgenerator.py
===================================================================
--- django/trunk/django/utils/feedgenerator.py 2011-09-09 21:43:11 UTC (rev
16744)
+++ django/trunk/django/utils/feedgenerator.py 2011-09-09 21:45:58 UTC (rev
16745)
@@ -42,7 +42,7 @@
time_str = date.strftime('%s, %%d %s %%Y %%H:%%M:%%S ' % (dow, month))
if date.tzinfo:
offset = date.tzinfo.utcoffset(date)
- timezone = (offset.days * 24 * 60) + (offset.seconds / 60)
+ timezone = (offset.days * 24 * 60) + (offset.seconds // 60)
hour, minute = divmod(timezone, 60)
return time_str + "%+03d%02d" % (hour, minute)
else:
@@ -54,7 +54,7 @@
if date.tzinfo:
time_str = date.strftime('%Y-%m-%dT%H:%M:%S')
offset = date.tzinfo.utcoffset(date)
- timezone = (offset.days * 24 * 60) + (offset.seconds / 60)
+ timezone = (offset.days * 24 * 60) + (offset.seconds // 60)
hour, minute = divmod(timezone, 60)
return time_str + "%+03d:%02d" % (hour, minute)
else:
Modified: django/trunk/django/utils/http.py
===================================================================
--- django/trunk/django/utils/http.py 2011-09-09 21:43:11 UTC (rev 16744)
+++ django/trunk/django/utils/http.py 2011-09-09 21:45:58 UTC (rev 16745)
@@ -166,7 +166,7 @@
# Construct base36 representation
while factor >= 0:
j = 36 ** factor
- base36.append(digits[i / j])
+ base36.append(digits[i // j])
i = i % j
factor -= 1
return ''.join(base36)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
