Refs #23919 -- Stopped inheriting from object to define new style classes.

10 files changed, 25 insertions, 25 deletions

diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py
index b207a1290a..f50e18d75c 100644
--- a/tests/utils_tests/test_archive.py
+++ b/tests/utils_tests/test_archive.py
@@ -11,7 +11,7 @@ from django.utils.archive import Archive, extract
 TEST_DIR = os.path.join(os.path.dirname(upath(__file__)), 'archives')
 
 
-class ArchiveTester(object):
+class ArchiveTester:
     archive = None
 
     def setUp(self):
diff --git a/tests/utils_tests/test_decorators.py b/tests/utils_tests/test_decorators.py
index a4d080e2d7..fe5db876ef 100644
--- a/tests/utils_tests/test_decorators.py
+++ b/tests/utils_tests/test_decorators.py
@@ -5,7 +5,7 @@ from django.test import RequestFactory, SimpleTestCase
 from django.utils.decorators import classproperty, decorator_from_middleware
 
 
-class ProcessViewMiddleware(object):
+class ProcessViewMiddleware:
     def process_view(self, request, view_func, view_args, view_kwargs):
         pass
 
@@ -18,7 +18,7 @@ def process_view(request):
     return HttpResponse()
 
 
-class ClassProcessView(object):
+class ClassProcessView:
     def __call__(self, request):
         return HttpResponse()
 
@@ -26,7 +26,7 @@ class ClassProcessView(object):
 class_process_view = process_view_dec(ClassProcessView())
 
 
-class FullMiddleware(object):
+class FullMiddleware:
     def process_request(self, request):
         request.process_request_reached = True
 
@@ -112,7 +112,7 @@ class DecoratorFromMiddlewareTests(SimpleTestCase):
 
 class ClassPropertyTest(SimpleTestCase):
     def test_getter(self):
-        class Foo(object):
+        class Foo:
             foo_attr = 123
 
             def __init__(self):
@@ -122,7 +122,7 @@ class ClassPropertyTest(SimpleTestCase):
             def foo(cls):
                 return cls.foo_attr
 
-        class Bar(object):
+        class Bar:
             bar = classproperty()
 
             @bar.getter
@@ -135,7 +135,7 @@ class ClassPropertyTest(SimpleTestCase):
         self.assertEqual(Bar().bar, 123)
 
     def test_override_getter(self):
-        class Foo(object):
+        class Foo:
             @classproperty
             def foo(cls):
                 return 123
diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py
index faf30a59c0..ca9343674d 100644
--- a/tests/utils_tests/test_encoding.py
+++ b/tests/utils_tests/test_encoding.py
@@ -14,7 +14,7 @@ class TestEncodingUtils(unittest.TestCase):
         """
         Broken __unicode__/__str__ actually raises an error.
         """
-        class MyString(object):
+        class MyString:
             def __str__(self):
                 return b'\xc3\xb6\xc3\xa4\xc3\xbc'
 
diff --git a/tests/utils_tests/test_functional.py b/tests/utils_tests/test_functional.py
index f53e212f93..befbcf931c 100644
--- a/tests/utils_tests/test_functional.py
+++ b/tests/utils_tests/test_functional.py
@@ -11,7 +11,7 @@ class FunctionalTestCase(unittest.TestCase):
 
     def test_lazy_base_class(self):
         """lazy also finds base class methods in the proxy object"""
-        class Base(object):
+        class Base:
             def base_method(self):
                 pass
 
@@ -23,7 +23,7 @@ class FunctionalTestCase(unittest.TestCase):
 
     def test_lazy_base_class_override(self):
         """lazy finds the correct (overridden) method implementation"""
-        class Base(object):
+        class Base:
             def method(self):
                 return 'Base'
 
@@ -36,7 +36,7 @@ class FunctionalTestCase(unittest.TestCase):
 
     def test_lazy_object_to_string(self):
 
-        class Klazz(object):
+        class Klazz:
             def __str__(self):
                 return "Î am ā Ǩlâzz."
 
@@ -51,7 +51,7 @@ class FunctionalTestCase(unittest.TestCase):
         """
         cached_property caches its value and that it behaves like a property
         """
-        class A(object):
+        class A:
 
             @cached_property
             def value(self):
diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
index 8f887fd011..5ffccdae83 100644
--- a/tests/utils_tests/test_html.py
+++ b/tests/utils_tests/test_html.py
@@ -167,7 +167,7 @@ class TestUtilsHtml(SimpleTestCase):
 
     def test_html_safe(self):
         @html.html_safe
-        class HtmlClass(object):
+        class HtmlClass:
             def __str__(self):
                 return "<h1>I'm a html class!</h1>"
 
@@ -177,7 +177,7 @@ class TestUtilsHtml(SimpleTestCase):
         self.assertEqual(force_text(html_obj), html_obj.__html__())
 
     def test_html_safe_subclass(self):
-        class BaseClass(object):
+        class BaseClass:
             def __html__(self):
                 # defines __html__ on its own
                 return 'some html content'
@@ -198,7 +198,7 @@ class TestUtilsHtml(SimpleTestCase):
         msg = "can't apply @html_safe to HtmlClass because it defines __html__()."
         with self.assertRaisesMessage(ValueError, msg):
             @html.html_safe
-            class HtmlClass(object):
+            class HtmlClass:
                 def __html__(self):
                     return "<h1>I'm a html class!</h1>"
 
@@ -206,5 +206,5 @@ class TestUtilsHtml(SimpleTestCase):
         msg = "can't apply @html_safe to HtmlClass because it doesn't define __str__()."
         with self.assertRaisesMessage(ValueError, msg):
             @html.html_safe
-            class HtmlClass(object):
+            class HtmlClass:
                 pass
diff --git a/tests/utils_tests/test_inspect.py b/tests/utils_tests/test_inspect.py
index e9a2cd086f..7464a9226d 100644
--- a/tests/utils_tests/test_inspect.py
+++ b/tests/utils_tests/test_inspect.py
@@ -3,7 +3,7 @@ import unittest
 from django.utils import inspect
 
 
-class Person(object):
+class Person:
     def no_arguments(self):
         return None
 
diff --git a/tests/utils_tests/test_lazyobject.py b/tests/utils_tests/test_lazyobject.py
index 513123ea00..11bf163747 100644
--- a/tests/utils_tests/test_lazyobject.py
+++ b/tests/utils_tests/test_lazyobject.py
@@ -9,7 +9,7 @@ from django.utils.functional import LazyObject, SimpleLazyObject, empty
 from .models import Category, CategoryInfo
 
 
-class Foo(object):
+class Foo:
     """
     A simple class with just one attribute.
     """
@@ -167,7 +167,7 @@ class LazyObjectTestCase(TestCase):
         # Tests whether an object's custom `__iter__` method is being
         # used when iterating over it.
 
-        class IterObject(object):
+        class IterObject:
 
             def __init__(self, values):
                 self.values = values
@@ -356,7 +356,7 @@ class SimpleLazyObjectTestCase(LazyObjectTestCase):
         self.assertEqual(len(lazy_set), 4)
 
 
-class BaseBaz(object):
+class BaseBaz:
     """
     A base class with a funky __reduce__ method, meant to simulate the
     __reduce__ method of Model, which sets self._django_version.
diff --git a/tests/utils_tests/test_module/__init__.py b/tests/utils_tests/test_module/__init__.py
index 29ee11b722..d8a5fe2ed9 100644
--- a/tests/utils_tests/test_module/__init__.py
+++ b/tests/utils_tests/test_module/__init__.py
@@ -1,4 +1,4 @@
-class SiteMock(object):
+class SiteMock:
     _registry = {}
 
 
diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py
index 2a524a2cf2..e979b3e7ba 100644
--- a/tests/utils_tests/test_module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -179,7 +179,7 @@ class AutodiscoverModulesTestCase(SimpleTestCase):
         self.assertEqual(site._registry, {'lorem': 'ipsum'})
 
 
-class ProxyFinder(object):
+class ProxyFinder:
     def __init__(self):
         self._cache = {}
 
@@ -208,7 +208,7 @@ class ProxyFinder(object):
                 fd.close()
 
 
-class TestFinder(object):
+class TestFinder:
     def __init__(self, *args, **kwargs):
         self.importer = zipimporter(*args, **kwargs)
 
@@ -219,7 +219,7 @@ class TestFinder(object):
         return TestLoader(importer)
 
 
-class TestLoader(object):
+class TestLoader:
     def __init__(self, importer):
         self.importer = importer
 
diff --git a/tests/utils_tests/test_safestring.py b/tests/utils_tests/test_safestring.py
index 9e99b6e20b..d1ef28944e 100644
--- a/tests/utils_tests/test_safestring.py
+++ b/tests/utils_tests/test_safestring.py
@@ -44,7 +44,7 @@ class SafeStringTest(SimpleTestCase):
         self.assertRenderEqual('{{ s }}', 'a&b', s=mark_safe(s))
 
     def test_mark_safe_object_implementing_dunder_str(self):
-        class Obj(object):
+        class Obj:
             def __str__(self):
                 return '<obj>'