Skip to content

Commit 94a75d7

Browse files
timgrahamtimgraham
committed
Added support for Django 2.0.
1 parent 4f13748 commit 94a75d7

File tree

36 files changed

+138
-145
lines changed

36 files changed

+138
-145
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ matrix:
1414
env: TOXENV=py27-1.11
1515
- python: 3.4
1616
env: TOXENV=py34-1.11
17+
- python: 3.4
18+
env: TOXENV=py34-2.0
1719
- python: 3.5
1820
env: TOXENV=py35-1.11
21+
- python: 3.5
22+
env: TOXENV=py35-2.0
1923
- python: 3.5
2024
env: TOXENV=py35-master
2125
- python: 3.6
2226
env: TOXENV=py36-1.11
27+
- python: 3.6
28+
env: TOXENV=py36-2.0
2329
- python: 3.6
2430
env: TOXENV=py36-master
2531
allow_failures:

‎docs/changelog.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Changelog
66

77
Other changes:
88

9-
- Dropped support for Django < 1.11.
9+
- Added support for Django 2.0 and dropped support for Django < 1.11.
1010

1111
1.6 (unreleased)
1212
------------------

‎localflavor/ar/forms.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ class ARPostalCodeField(RegexField):
3131
}
3232

3333
def __init__(self, max_length=8, min_length=4, *args, **kwargs):
34-
super(ARPostalCodeField, self).__init__(r'^\d{4}$|^[A-HJ-NP-Za-hj-np-z]\d{4}\D{3}$',
35-
max_length, min_length,
36-
*args, **kwargs)
34+
super(ARPostalCodeField, self).__init__(
35+
r'^\d{4}$|^[A-HJ-NP-Za-hj-np-z]\d{4}\D{3}$',
36+
max_length=max_length, min_length=min_length, *args, **kwargs
37+
)
3738

3839
def clean(self, value):
3940
value = super(ARPostalCodeField, self).clean(value)
@@ -55,8 +56,7 @@ class ARDNIField(CharField):
5556
}
5657

5758
def __init__(self, max_length=10, min_length=7, *args, **kwargs):
58-
super(ARDNIField, self).__init__(max_length, min_length,
59-
*args, **kwargs)
59+
super(ARDNIField, self).__init__(max_length=max_length, min_length=min_length, *args, **kwargs)
6060

6161
def clean(self, value):
6262
"""Value can be a string either in the [X]X.XXX.XXX or [X]XXXXXXX formats."""
@@ -92,9 +92,8 @@ class ARCUITField(RegexField):
9292
'legal_type': _('Invalid legal type. Type must be 27, 20, 30, 23, 24 or 33.'),
9393
}
9494

95-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
96-
super(ARCUITField, self).__init__(r'^\d{2}-?\d{8}-?\d$',
97-
max_length, min_length, *args, **kwargs)
95+
def __init__(self, *args, **kwargs):
96+
super(ARCUITField, self).__init__(r'^\d{2}-?\d{8}-?\d$', *args, **kwargs)
9897

9998
def clean(self, value):
10099
"""Value can be either a string in the format XX-XXXXXXXX-X or an 11-digit number."""

‎localflavor/at/forms.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ class ATZipCodeField(RegexField):
2424
'invalid': _('Enter a zip code in the format XXXX.'),
2525
}
2626

27-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
28-
super(ATZipCodeField, self).__init__(r'^[1-9]{1}\d{3}$',
29-
max_length, min_length, *args, **kwargs)
27+
def __init__(self, *args, **kwargs):
28+
super(ATZipCodeField, self).__init__(r'^[1-9]{1}\d{3}$', *args, **kwargs)
3029

3130

3231
class ATStateSelect(Select):

‎localflavor/au/forms.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ class AUPostCodeField(RegexField):
2929
'invalid': _('Enter a 4 digit postcode.'),
3030
}
3131

32-
def __init__(self, max_length=4, min_length=None, *args, **kwargs):
33-
super(AUPostCodeField, self).__init__(r'^\d{4}$',
34-
max_length, min_length, *args, **kwargs)
32+
def __init__(self, max_length=4, *args, **kwargs):
33+
super(AUPostCodeField, self).__init__(r'^\d{4}$', max_length=max_length, *args, **kwargs)
3534

3635

3736
class AUPhoneNumberField(CharField, DeprecatedPhoneNumberFormFieldMixin):

‎localflavor/be/forms.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ class BEPostalCodeField(RegexField):
2525
'Enter a valid postal code in the range and format 1XXX - 9XXX.'),
2626
}
2727

28-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
29-
super(BEPostalCodeField, self).__init__(r'^[1-9]\d{3}$',
30-
max_length, min_length, *args, **kwargs)
28+
def __init__(self, *args, **kwargs):
29+
super(BEPostalCodeField, self).__init__(r'^[1-9]\d{3}$', *args, **kwargs)
3130

3231

3332
class BEPhoneNumberField(RegexField, DeprecatedPhoneNumberFormFieldMixin):
@@ -59,7 +58,7 @@ class BEPhoneNumberField(RegexField, DeprecatedPhoneNumberFormFieldMixin):
5958
'0xxxxxxxx or 04xxxxxxxx.'),
6059
}
6160

62-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
61+
def __init__(self, *args, **kwargs):
6362
super(BEPhoneNumberField, self).__init__(r'^[0]\d{1}[/. ]?'
6463
r'\d{3}[. ]\d{2}[. ]?'
6564
r'\d{2}$|^[0]\d{2}[/. ]?'
@@ -68,7 +67,6 @@ def __init__(self, max_length=None, min_length=None, *args, **kwargs):
6867
r'\d{2}[. ]?'
6968
r'\d{2}[. ]?'
7069
r'\d{2}$',
71-
max_length, min_length,
7270
*args, **kwargs)
7371

7472

‎localflavor/br/forms.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ class BRZipCodeField(RegexField):
3333
'invalid': _('Enter a zip code in the format XXXXX-XXX.'),
3434
}
3535

36-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
37-
super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$',
38-
max_length, min_length, *args, **kwargs)
36+
def __init__(self, *args, **kwargs):
37+
super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$', *args, **kwargs)
3938

4039

4140
class BRPhoneNumberField(Field, DeprecatedPhoneNumberFormFieldMixin):
@@ -81,8 +80,8 @@ class BRStateChoiceField(Field):
8180
'invalid': _('Select a valid brazilian state. That state is not one of the available states.'),
8281
}
8382

84-
def __init__(self, required=True, widget=None, label=None, initial=None, help_text=None):
85-
super(BRStateChoiceField, self).__init__(required, widget, label, initial, help_text)
83+
def __init__(self, **kwargs):
84+
super(BRStateChoiceField, self).__init__(**kwargs)
8685
self.widget.choices = STATE_CHOICES
8786

8887
def clean(self, value):
@@ -129,7 +128,7 @@ class BRCPFField(CharField):
129128
}
130129

131130
def __init__(self, max_length=14, min_length=11, *args, **kwargs):
132-
super(BRCPFField, self).__init__(max_length, min_length, *args, **kwargs)
131+
super(BRCPFField, self).__init__(max_length=max_length, min_length=min_length, *args, **kwargs)
133132

134133
def clean(self, value):
135134
"""Value can be either a string in the format XXX.XXX.XXX-XX or an 11-digit number."""
@@ -188,7 +187,7 @@ class BRCNPJField(CharField):
188187
}
189188

190189
def __init__(self, min_length=14, max_length=18, *args, **kwargs):
191-
super(BRCNPJField, self).__init__(max_length, min_length, *args, **kwargs)
190+
super(BRCNPJField, self).__init__(max_length=max_length, min_length=min_length, *args, **kwargs)
192191

193192
def clean(self, value):
194193
"""Value can be either a string in the format XX.XXX.XXX/XXXX-XX or a group of 14 characters."""
@@ -237,7 +236,7 @@ class BRProcessoField(CharField):
237236
default_error_messages = {'invalid': _("Invalid Process number.")}
238237

239238
def __init__(self, max_length=25, min_length=20, *args, **kwargs):
240-
super(BRProcessoField, self).__init__(max_length, min_length, *args, **kwargs)
239+
super(BRProcessoField, self).__init__(max_length=max_length, min_length=min_length, *args, **kwargs)
241240

242241
def clean(self, value):
243242
"""Value can be either a string in the format NNNNNNN-DD.AAAA.J.TR.OOOO or an 20-digit number."""

‎localflavor/ch/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class CHZipCodeField(RegexField):
3636
'invalid': _('Enter a valid postal code in the range and format 1XXX - 9XXX.'),
3737
}
3838

39-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
40-
super(CHZipCodeField, self).__init__(zip_re, max_length, min_length, *args, **kwargs)
39+
def __init__(self, *args, **kwargs):
40+
super(CHZipCodeField, self).__init__(zip_re, *args, **kwargs)
4141

4242

4343
class CHPhoneNumberField(Field, DeprecatedPhoneNumberFormFieldMixin):

‎localflavor/cn/forms.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class CNIDCardField(CharField):
110110
}
111111

112112
def __init__(self, max_length=18, min_length=15, *args, **kwargs):
113-
super(CNIDCardField, self).__init__(max_length, min_length, *args, **kwargs)
113+
super(CNIDCardField, self).__init__(max_length=max_length, min_length=min_length, *args, **kwargs)
114114

115115
def clean(self, value):
116116
"""Check whether the input is a valid ID Card Number."""

‎localflavor/cz/forms.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ class CZPostalCodeField(RegexField):
3333
'invalid': _('Enter a postal code in the format XXXXX or XXX XX.'),
3434
}
3535

36-
def __init__(self, max_length=None, min_length=None, *args, **kwargs):
37-
super(CZPostalCodeField, self).__init__(r'^\d{5}$|^\d{3} \d{2}$',
38-
max_length, min_length, *args, **kwargs)
36+
def __init__(self, *args, **kwargs):
37+
super(CZPostalCodeField, self).__init__(r'^\d{5}$|^\d{3} \d{2}$', *args, **kwargs)
3938

4039
def clean(self, value):
4140
"""

0 commit comments

Comments
 (0)