Commit 180b672a authored by Claude Paroz's avatar Claude Paroz
Browse files

[py3] Fixed Python 3 compatibility in localflavor forms

parent e0988ecd

django/contrib/localflavor/br/forms.py

+2 −2
Original line number Diff line number Diff line
@@ -154,10 +154,10 @@ class BRCNPJField(Field): 
            raise ValidationError(self.error_messages['max_digits'])

        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)

        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)

        value = value[:-1] + str(new_2dv)

        if value[-2:] != orig_dv:

django/contrib/localflavor/si/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class SIEMSOField(CharField): 
        # Validate EMSO

        s = 0

        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

        chk = s % 11

        if chk == 0: