p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[py3] Fixed Python 3 compatibility in localflavor forms

This commit is contained in:
Claude Paroz 2012-08-08 23:22:27 +02:00
parent e0988ecd1e
commit 180b672a65
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/localflavor/br/forms.py
View File

@ -154,10 +154,10 @@ class BRCNPJField(Field):
raise ValidationError(self.error_messages['max_digits']) raise ValidationError(self.error_messages['max_digits'])
orig_dv = value[-2:] orig_dv = value[-2:]
new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(range(5, 1, -1) + range(9, 1, -1))]) new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(list(range(5, 1, -1)) + list(range(9, 1, -1)))])
new_1dv = DV_maker(new_1dv % 11) new_1dv = DV_maker(new_1dv % 11)
value = value[:-2] + str(new_1dv) + value[-1] value = value[:-2] + str(new_1dv) + value[-1]
new_2dv = sum([i * int(value[idx]) for idx, i in enumerate(range(6, 1, -1) + range(9, 1, -1))]) new_2dv = sum([i * int(value[idx]) for idx, i in enumerate(list(range(6, 1, -1)) + list(range(9, 1, -1)))])
new_2dv = DV_maker(new_2dv % 11) new_2dv = DV_maker(new_2dv % 11)
value = value[:-1] + str(new_2dv) value = value[:-1] + str(new_2dv)
if value[-2:] != orig_dv: if value[-2:] != orig_dv:

2
django/contrib/localflavor/si/forms.py
View File

@ -41,7 +41,7 @@ class SIEMSOField(CharField):
# Validate EMSO # Validate EMSO
s = 0 s = 0
int_values = [int(i) for i in value] int_values = [int(i) for i in value]
for a, b in zip(int_values, range(7, 1, -1) * 2): for a, b in zip(int_values, list(range(7, 1, -1)) * 2):
s += a * b s += a * b
chk = s % 11 chk = s % 11
if chk == 0: if chk == 0: