summaryrefslogtreecommitdiff
path: root/tests/forms_tests
diff options
context:
space:
mode:
authorSimon Charette <charettes@users.noreply.github.com>2017-01-19 02:39:46 -0500
committerClaude Paroz <claude@2xlibre.net>2017-01-19 08:39:46 +0100
commitcecc079168e8669138728d31611ff3a1e7eb3a9f (patch)
tree2415083d44f84c6f206930fc689a8c0e50a98caa /tests/forms_tests
parenta5563963397aeee30c32e3c1dab31bfe453ca89f (diff)
Refs #23919 -- Stopped inheriting from object to define new style classes.
Diffstat (limited to 'tests/forms_tests')
-rw-r--r--tests/forms_tests/field_tests/__init__.py2
-rw-r--r--tests/forms_tests/field_tests/test_base.py2
-rw-r--r--tests/forms_tests/tests/test_error_messages.py2
-rw-r--r--tests/forms_tests/tests/test_renderers.py2
-rw-r--r--tests/forms_tests/widget_tests/test_clearablefileinput.py10
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/forms_tests/field_tests/__init__.py b/tests/forms_tests/field_tests/__init__.py
index b984c6fb40..4aae30282b 100644
--- a/tests/forms_tests/field_tests/__init__.py
+++ b/tests/forms_tests/field_tests/__init__.py
@@ -1,7 +1,7 @@
from django import forms
-class FormFieldAssertionsMixin(object):
+class FormFieldAssertionsMixin:
def assertWidgetRendersTo(self, field, to):
class Form(forms.Form):
diff --git a/tests/forms_tests/field_tests/test_base.py b/tests/forms_tests/field_tests/test_base.py
index 67c3003393..721c0a935a 100644
--- a/tests/forms_tests/field_tests/test_base.py
+++ b/tests/forms_tests/field_tests/test_base.py
@@ -9,7 +9,7 @@ class BasicFieldsTests(SimpleTestCase):
self.assertFalse(Field(required=False).widget.is_required)
def test_cooperative_multiple_inheritance(self):
- class A(object):
+ class A:
def __init__(self):
self.class_a_var = True
super(A, self).__init__()
diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py
index 10c7a92f7d..40b085f55b 100644
--- a/tests/forms_tests/tests/test_error_messages.py
+++ b/tests/forms_tests/tests/test_error_messages.py
@@ -13,7 +13,7 @@ from django.utils.safestring import mark_safe
from ..models import ChoiceModel
-class AssertFormErrorsMixin(object):
+class AssertFormErrorsMixin:
def assertFormErrors(self, expected, the_callable, *args, **kwargs):
with self.assertRaises(ValidationError) as cm:
the_callable(*args, **kwargs)
diff --git a/tests/forms_tests/tests/test_renderers.py b/tests/forms_tests/tests/test_renderers.py
index 2ce6be66af..df9c9cf367 100644
--- a/tests/forms_tests/tests/test_renderers.py
+++ b/tests/forms_tests/tests/test_renderers.py
@@ -13,7 +13,7 @@ except ImportError:
jinja2 = None
-class SharedTests(object):
+class SharedTests:
expected_widget_dir = 'templates'
def test_installed_apps_template_found(self):
diff --git a/tests/forms_tests/widget_tests/test_clearablefileinput.py b/tests/forms_tests/widget_tests/test_clearablefileinput.py
index dd7f04d0ac..eea7054541 100644
--- a/tests/forms_tests/widget_tests/test_clearablefileinput.py
+++ b/tests/forms_tests/widget_tests/test_clearablefileinput.py
@@ -4,7 +4,7 @@ from django.forms import ClearableFileInput
from .base import WidgetTest
-class FakeFieldFile(object):
+class FakeFieldFile:
"""
Quacks like a FieldFile (has a .url and unicode representation), but
doesn't require us to care about storages etc.
@@ -37,7 +37,7 @@ class ClearableFileInputTest(WidgetTest):
A ClearableFileInput should escape name, filename, and URL
when rendering HTML (#15182).
"""
- class StrangeFieldFile(object):
+ class StrangeFieldFile:
url = "something?chapter=1&sect=2&copy=3&lang=en"
def __str__(self):
@@ -107,7 +107,7 @@ class ClearableFileInputTest(WidgetTest):
A ClearableFileInput should not mask exceptions produced while
checking that it has a value.
"""
- class FailingURLFieldFile(object):
+ class FailingURLFieldFile:
@property
def url(self):
raise ValueError('Canary')
@@ -119,7 +119,7 @@ class ClearableFileInputTest(WidgetTest):
self.widget.render('myfile', FailingURLFieldFile())
def test_url_as_property(self):
- class URLFieldFile(object):
+ class URLFieldFile:
@property
def url(self):
return 'https://www.python.org/'
@@ -131,7 +131,7 @@ class ClearableFileInputTest(WidgetTest):
self.assertInHTML('<a href="https://www.python.org/">value</a>', html)
def test_return_false_if_url_does_not_exists(self):
- class NoURLFieldFile(object):
+ class NoURLFieldFile:
def __str__(self):
return 'value'