summaryrefslogtreecommitdiff
path: root/tests/forms_tests
diff options
context:
space:
mode:
authorchillaranand <anand21nanda@gmail.com>2017-01-21 18:43:44 +0530
committerTim Graham <timograham@gmail.com>2017-01-25 12:23:46 -0500
commitd6eaf7c0183cd04b78f2a55e1d60bb7e59598310 (patch)
treeab02fd9949d4bfa23e27dea45e213ce334c883f0 /tests/forms_tests
parentdc165ec8e5698ffc6dee6b510f1f92c9fd7467fe (diff)
Refs #23919 -- Replaced super(ClassName, self) with super().
Diffstat (limited to 'tests/forms_tests')
-rw-r--r--tests/forms_tests/field_tests/test_base.py4
-rw-r--r--tests/forms_tests/field_tests/test_multivaluefield.py6
-rw-r--r--tests/forms_tests/tests/test_forms.py20
-rw-r--r--tests/forms_tests/tests/test_formsets.py6
-rw-r--r--tests/forms_tests/tests/test_media.py6
-rw-r--r--tests/forms_tests/widget_tests/base.py2
-rw-r--r--tests/forms_tests/widget_tests/test_multiwidget.py8
7 files changed, 25 insertions, 27 deletions
diff --git a/tests/forms_tests/field_tests/test_base.py b/tests/forms_tests/field_tests/test_base.py
index 721c0a935a..4ddbea3414 100644
--- a/tests/forms_tests/field_tests/test_base.py
+++ b/tests/forms_tests/field_tests/test_base.py
@@ -12,11 +12,11 @@ class BasicFieldsTests(SimpleTestCase):
class A:
def __init__(self):
self.class_a_var = True
- super(A, self).__init__()
+ super().__init__()
class ComplexField(Field, A):
def __init__(self):
- super(ComplexField, self).__init__()
+ super().__init__()
f = ComplexField()
self.assertTrue(f.class_a_var)
diff --git a/tests/forms_tests/field_tests/test_multivaluefield.py b/tests/forms_tests/field_tests/test_multivaluefield.py
index e7d161fb5b..1395be6cd0 100644
--- a/tests/forms_tests/field_tests/test_multivaluefield.py
+++ b/tests/forms_tests/field_tests/test_multivaluefield.py
@@ -17,7 +17,7 @@ class ComplexMultiWidget(MultiWidget):
SelectMultiple(choices=beatles),
SplitDateTimeWidget(),
)
- super(ComplexMultiWidget, self).__init__(widgets, attrs)
+ super().__init__(widgets, attrs)
def decompress(self, value):
if value:
@@ -40,7 +40,7 @@ class ComplexField(MultiValueField):
MultipleChoiceField(choices=beatles),
SplitDateTimeField(),
)
- super(ComplexField, self).__init__(fields, required, widget, label, initial)
+ super().__init__(fields, required, widget, label, initial)
def compress(self, data_list):
if data_list:
@@ -57,7 +57,7 @@ class MultiValueFieldTest(SimpleTestCase):
@classmethod
def setUpClass(cls):
cls.field = ComplexField(widget=ComplexMultiWidget())
- super(MultiValueFieldTest, cls).setUpClass()
+ super().setUpClass()
def test_clean(self):
self.assertEqual(
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index 2a1ec44f66..19f1927824 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -1231,7 +1231,7 @@ value="Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/
last_name = CharField()
def __init__(self, *args, **kwargs):
- super(Person, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.fields['birthday'] = DateField()
p = Person(auto_id=False)
@@ -1302,7 +1302,7 @@ value="Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/
last_name = CharField(required=False)
def __init__(self, names_required=False, *args, **kwargs):
- super(Person, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
if names_required:
self.fields['first_name'].required = True
@@ -1329,7 +1329,7 @@ value="Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/
last_name = CharField(max_length=30)
def __init__(self, name_max_length=None, *args, **kwargs):
- super(Person, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
if name_max_length:
self.fields['first_name'].max_length = name_max_length
@@ -1350,7 +1350,7 @@ value="Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/
gender = ChoiceField(choices=(('f', 'Female'), ('m', 'Male')))
def __init__(self, allow_unspec_gender=False, *args, **kwargs):
- super(Person, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
if allow_unspec_gender:
self.fields['gender'].choices += (('u', 'Unspecified'),)
@@ -1540,7 +1540,7 @@ value="Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/
field_order = None
def __init__(self, **kwargs):
- super(TestFormInit, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.order_fields(field_order=TestForm.field_order)
p = TestFormParent()
@@ -2818,7 +2818,7 @@ Good luck picking a username that doesn&#39;t already exist.</p>
def __init__(self, fields=(), *args, **kwargs):
fields = (CharField(label='First name', max_length=10),
CharField(label='Last name', max_length=10))
- super(NameField, self).__init__(fields=fields, *args, **kwargs)
+ super().__init__(fields=fields, *args, **kwargs)
def compress(self, data_list):
return ' '.join(data_list)
@@ -2849,7 +2849,7 @@ Good luck picking a username that doesn&#39;t already exist.</p>
ChoiceField(label='Rank', choices=((1, 1), (2, 2))),
CharField(label='Name', max_length=10),
)
- super(ChoicesField, self).__init__(fields=fields, *args, **kwargs)
+ super().__init__(fields=fields, *args, **kwargs)
field = ChoicesField()
field2 = copy.deepcopy(field)
@@ -2864,7 +2864,7 @@ Good luck picking a username that doesn&#39;t already exist.</p>
class DateAgeField(MultiValueField):
def __init__(self, fields=(), *args, **kwargs):
fields = (DateField(label="Date"), IntegerField(label="Age"))
- super(DateAgeField, self).__init__(fields=fields, *args, **kwargs)
+ super().__init__(fields=fields, *args, **kwargs)
class DateAgeForm(Form):
date_age = DateAgeField()
@@ -2883,7 +2883,7 @@ Good luck picking a username that doesn&#39;t already exist.</p>
CharField(label='Extension', error_messages={'incomplete': 'Enter an extension.'}),
CharField(label='Label', required=False, help_text='E.g. home, work.'),
)
- super(PhoneField, self).__init__(fields, *args, **kwargs)
+ super().__init__(fields, *args, **kwargs)
def compress(self, data_list):
if data_list:
@@ -2964,7 +2964,7 @@ Good luck picking a username that doesn&#39;t already exist.</p>
# Fake json.loads
if value == '{}':
return {}
- return super(CustomJSONField, self).to_python(value)
+ return super().to_python(value)
class JSONForm(forms.Form):
json = CustomJSONField()
diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py
index 3c3228fafc..26d9e15605 100644
--- a/tests/forms_tests/tests/test_formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
@@ -58,7 +58,7 @@ SplitDateTimeFormSet = formset_factory(SplitDateTimeForm)
class CustomKwargForm(Form):
def __init__(self, *args, **kwargs):
self.custom_kwarg = kwargs.pop('custom_kwarg')
- super(CustomKwargForm, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
class FormsFormsetTestCase(SimpleTestCase):
@@ -1056,7 +1056,7 @@ class FormsFormsetTestCase(SimpleTestCase):
return reversed(self.forms)
def __getitem__(self, idx):
- return super(BaseReverseFormSet, self).__getitem__(len(self) - idx - 1)
+ return super().__getitem__(len(self) - idx - 1)
ReverseChoiceFormset = formset_factory(Choice, BaseReverseFormSet, extra=3)
reverse_formset = ReverseChoiceFormset()
@@ -1106,7 +1106,7 @@ class FormsFormsetTestCase(SimpleTestCase):
class AnotherChoice(Choice):
def is_valid(self):
self.is_valid_called = True
- return super(AnotherChoice, self).is_valid()
+ return super().is_valid()
AnotherChoiceFormSet = formset_factory(AnotherChoice)
data = {
diff --git a/tests/forms_tests/tests/test_media.py b/tests/forms_tests/tests/test_media.py
index 72db13ef21..488fe190b2 100644
--- a/tests/forms_tests/tests/test_media.py
+++ b/tests/forms_tests/tests/test_media.py
@@ -164,7 +164,7 @@ class FormsMediaTestCase(SimpleTestCase):
# Media properties can reference the media of their parents
class MyWidget5(MyWidget4):
def _media(self):
- return super(MyWidget5, self).media + Media(css={'all': ('/other/path',)}, js=('/other/js',))
+ return super().media + Media(css={'all': ('/other/path',)}, js=('/other/js',))
media = property(_media)
w5 = MyWidget5()
@@ -185,7 +185,7 @@ class FormsMediaTestCase(SimpleTestCase):
class MyWidget6(MyWidget1):
def _media(self):
- return super(MyWidget6, self).media + Media(css={'all': ('/other/path',)}, js=('/other/js',))
+ return super().media + Media(css={'all': ('/other/path',)}, js=('/other/js',))
media = property(_media)
w6 = MyWidget6()
@@ -405,7 +405,7 @@ class FormsMediaTestCase(SimpleTestCase):
class MyMultiWidget(MultiWidget):
def __init__(self, attrs=None):
widgets = [MyWidget1, MyWidget2, MyWidget3]
- super(MyMultiWidget, self).__init__(widgets, attrs)
+ super().__init__(widgets, attrs)
mymulti = MyMultiWidget()
self.assertEqual(
diff --git a/tests/forms_tests/widget_tests/base.py b/tests/forms_tests/widget_tests/base.py
index 490f033bad..7222910479 100644
--- a/tests/forms_tests/widget_tests/base.py
+++ b/tests/forms_tests/widget_tests/base.py
@@ -15,7 +15,7 @@ class WidgetTest(SimpleTestCase):
cls.django_renderer = DjangoTemplates()
cls.jinja2_renderer = Jinja2() if jinja2 else None
cls.renderers = [cls.django_renderer] + ([cls.jinja2_renderer] if cls.jinja2_renderer else [])
- super(WidgetTest, cls).setUpClass()
+ super().setUpClass()
def check_html(self, widget, name, value, html='', attrs=None, strict=False, **kwargs):
assertEqual = self.assertEqual if strict else self.assertHTMLEqual
diff --git a/tests/forms_tests/widget_tests/test_multiwidget.py b/tests/forms_tests/widget_tests/test_multiwidget.py
index bf9ef38a6b..b19b5ce9cf 100644
--- a/tests/forms_tests/widget_tests/test_multiwidget.py
+++ b/tests/forms_tests/widget_tests/test_multiwidget.py
@@ -24,7 +24,7 @@ class ComplexMultiWidget(MultiWidget):
SelectMultiple(choices=WidgetTest.beatles),
SplitDateTimeWidget(),
)
- super(ComplexMultiWidget, self).__init__(widgets, attrs)
+ super().__init__(widgets, attrs)
def decompress(self, value):
if value:
@@ -45,9 +45,7 @@ class ComplexField(MultiValueField):
MultipleChoiceField(choices=WidgetTest.beatles),
SplitDateTimeField(),
)
- super(ComplexField, self).__init__(
- fields, required, widget, label, initial,
- )
+ super().__init__(fields, required, widget, label, initial)
def compress(self, data_list):
if data_list:
@@ -66,7 +64,7 @@ class DeepCopyWidget(MultiWidget):
RadioSelect(choices=choices),
TextInput,
]
- super(DeepCopyWidget, self).__init__(widgets)
+ super().__init__(widgets)
def _set_choices(self, choices):
"""