Merge ~d0ugal/maas:super3 into maas:master

[Dougal Matthews]

Use Python 3 super calls where possible

[MAAS Lander (maas-lander)]

UNIT TESTS
-b super3 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7988be8eafe24ae33b384ee460f1d290a8e60e92

review: Approve

[Adam Collard (adam-collard)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b super3 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7755/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b super3 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7757/consoleText

diff --git a/src/apiclient/maas_client.py b/src/apiclient/maas_client.py
index 89e2a3b..fd4b2d8 100644
--- a/src/apiclient/maas_client.py
+++ b/src/apiclient/maas_client.py
@@ -75,11 +75,7 @@ class RequestWithMethod(urllib.request.Request):
         urllib.request.Request.__init__(self, *args, **kwargs)
 
     def get_method(self):
-        return (
-            self._method
-            if self._method
-            else super(RequestWithMethod, self).get_method()
-        )
+        return self._method if self._method else super().get_method()
 
 
 class MAASDispatcher:
diff --git a/src/apiclient/testing/django.py b/src/apiclient/testing/django.py
index 41fcdb7..3a7cf9c 100644
--- a/src/apiclient/testing/django.py
+++ b/src/apiclient/testing/django.py
@@ -23,7 +23,7 @@ class APIClientTestCase(MAASTestCase):
     """
 
     def setUp(self):
-        super(APIClientTestCase, self).setUp()
+        super().setUp()
         # Django 1.8 and 1.11 need to be configured before we can use
         # WSGIRequest and MultiPartParser.
         if not django.conf.settings.configured:
@@ -33,7 +33,7 @@ class APIClientTestCase(MAASTestCase):
         # Reset django settings after each test since configuring Django breaks
         # tests for maascli commands which attempt to really load Django.
         django.conf.settings = django.conf.LazySettings()
-        super(APIClientTestCase, self).tearDown()
+        super().tearDown()
 
     @classmethod
     def parse_headers_and_body_with_django(cls, headers, body):
diff --git a/src/maascli/api.py b/src/maascli/api.py
index 6f7ffd2..a0bd96a 100644
--- a/src/maascli/api.py
+++ b/src/maascli/api.py
@@ -92,7 +92,7 @@ class Action(Command):
     op = property(lambda self: self.action["op"])
 
     def __init__(self, parser):
-        super(Action, self).__init__(parser)
+        super().__init__(parser)
         for param in self.handler["params"]:
             parser.add_argument(param)
         parser.add_argument("data", type=self.name_value_pair, nargs="*")
diff --git a/src/maascli/cli.py b/src/maascli/cli.py
index 673e93c..44f2c41 100644
--- a/src/maascli/cli.py
+++ b/src/maascli/cli.py
@@ -37,7 +37,7 @@ class cmd_login(Command):
     """
 
     def __init__(self, parser):
-        super(cmd_login, self).__init__(parser)
+        super().__init__(parser)
         parser.add_argument(
             "profile_name",
             metavar="profile-name",
@@ -150,7 +150,7 @@ class cmd_logout(Command):
     """
 
     def __init__(self, parser):
-        super(cmd_logout, self).__init__(parser)
+        super().__init__(parser)
         parser.add_argument(
             "profile_name",
             metavar="profile-name",
diff --git a/src/maascli/command.py b/src/maascli/command.py
index 4c3372f..82c9629 100644
--- a/src/maascli/command.py
+++ b/src/maascli/command.py
@@ -21,7 +21,7 @@ class Command(metaclass=ABCMeta):
     hidden = False
 
     def __init__(self, parser):
-        super(Command, self).__init__()
+        super().__init__()
         self.parser = parser
 
     @abstractmethod
diff --git a/src/maascli/parser.py b/src/maascli/parser.py
index 36abc16..7eef93b 100644
--- a/src/maascli/parser.py
+++ b/src/maascli/parser.py
@@ -35,7 +35,7 @@ class ArgumentParser(argparse.ArgumentParser):
         kwargs.setdefault(
             "formatter_class", argparse.RawDescriptionHelpFormatter
         )
-        super(ArgumentParser, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def add_subparsers(self, title="drill down", metavar="COMMAND", **kwargs):
         assert (
diff --git a/src/maascli/snappy.py b/src/maascli/snappy.py
index 848ad68..fced691 100644
--- a/src/maascli/snappy.py
+++ b/src/maascli/snappy.py
@@ -848,7 +848,7 @@ class cmd_init(SnappyCommand):
     """
 
     def __init__(self, parser):
-        super(cmd_init, self).__init__(parser)
+        super().__init__(parser)
         monkey_patch_for_all_mode_bw_compatability(parser)
         subparsers = parser.add_subparsers(
             metavar=None, title="run modes", dest="run_mode"
@@ -1116,7 +1116,7 @@ class cmd_config(SnappyCommand):
     }
 
     def __init__(self, parser):
-        super(cmd_config, self).__init__(parser)
+        super().__init__(parser)
         parser.add_argument(
             "--show",
             action="store_true",
@@ -1298,7 +1298,7 @@ class cmd_migrate(SnappyCommand):
     """Perform migrations on connected database."""
 
     def __init__(self, parser):
-        super(cmd_migrate, self).__init__(parser)
+        super().__init__(parser)
         # '--configure' is hidden and only called from snap hooks to update the
         # database when running in "all" mode
         parser.add_argument(
diff --git a/src/maascli/tests/test_snappy.py b/src/maascli/tests/test_snappy.py
index 4e892d2..ed0aaf7 100644
--- a/src/maascli/tests/test_snappy.py
+++ b/src/maascli/tests/test_snappy.py
@@ -26,7 +26,7 @@ from maastesting.testcase import MAASTestCase
 
 class TestHelpers(MAASTestCase):
     def setUp(self):
-        super(TestHelpers, self).setUp()
+        super().setUp()
         snap_common = self.make_dir()
         snap_data = self.make_dir()
         self.environ = {"SNAP_COMMON": snap_common, "SNAP_DATA": snap_data}
@@ -197,7 +197,7 @@ class TestRenderSupervisord(MAASTestCase):
     )
 
     def setUp(self):
-        super(TestRenderSupervisord, self).setUp()
+        super().setUp()
         snap = self.make_dir()
         maas_share = os.path.join(snap, "usr", "share", "maas")
         os.makedirs(maas_share)
@@ -304,7 +304,7 @@ class TestSupervisordHelpers(MAASTestCase):
 
 class TestConfigHelpers(MAASTestCase):
     def setUp(self):
-        super(TestConfigHelpers, self).setUp()
+        super().setUp()
         snap_data = self.make_dir()
         self.environ = {"SNAP_DATA": snap_data}
         self.regiond_path = os.path.join(snap_data, "regiond.conf")
diff --git a/src/maasserver/api/auth.py b/src/maasserver/api/auth.py
index 5e862e2..5bab847 100644
--- a/src/maasserver/api/auth.py
+++ b/src/maasserver/api/auth.py
@@ -23,7 +23,7 @@ class OAuthUnauthorized(Unauthorized):
     """Unauthorized error for OAuth signed requests with invalid tokens."""
 
     def __init__(self, error):
-        super(OAuthUnauthorized, self).__init__()
+        super().__init__()
         self.error = error
         # When the error is an authentication error, use a more
         # user-friendly error message.
diff --git a/src/maasserver/api/support.py b/src/maasserver/api/support.py
index 134298d..ba0729f 100644
--- a/src/maasserver/api/support.py
+++ b/src/maasserver/api/support.py
@@ -53,7 +53,7 @@ class OperationsResource(Resource):
         return False
 
     def __call__(self, request, *args, **kwargs):
-        upcall = super(OperationsResource, self).__call__
+        upcall = super().__call__
         response = upcall(request, *args, **kwargs)
         response["X-MAAS-API-Hash"] = get_api_description_hash()
         return response
@@ -96,14 +96,12 @@ class RestrictedResource(OperationsResource):
           handler = RestrictedResource(HandlerClass, authentication=[])
 
         """
-        super(RestrictedResource, self).__init__(handler, authentication)
+        super().__init__(handler, authentication)
         if not self.is_authentication_attempted:
             raise AssertionError("Authentication must be attempted.")
 
     def authenticate(self, request, rm):
-        actor, anonymous = super(RestrictedResource, self).authenticate(
-            request, rm
-        )
+        actor, anonymous = super().authenticate(request, rm)
         if not anonymous and not request.user.is_active:
             raise PermissionDenied("User is not allowed access to this API.")
         else:
@@ -114,9 +112,7 @@ class AdminRestrictedResource(RestrictedResource):
     """A resource that's restricted to administrators."""
 
     def authenticate(self, request, rm):
-        actor, anonymous = super(AdminRestrictedResource, self).authenticate(
-            request, rm
-        )
+        actor, anonymous = super().authenticate(request, rm)
         if anonymous or not request.user.is_superuser:
             raise PermissionDenied("User is not allowed access to this API.")
         else:
diff --git a/src/maasserver/api/tests/test_api.py b/src/maasserver/api/tests/test_api.py
index 3957cc2..50464ec 100644
--- a/src/maasserver/api/tests/test_api.py
+++ b/src/maasserver/api/tests/test_api.py
@@ -148,7 +148,7 @@ class TestStoreNodeParameters(APITestCase.ForUser):
     """Tests for `store_node_power_parameters`."""
 
     def setUp(self):
-        super(TestStoreNodeParameters, self).setUp()
+        super().setUp()
         self.node = factory.make_Node()
         self.save = self.patch(self.node, "save")
         self.request = Mock()
diff --git a/src/maasserver/api/tests/test_boot_source_selections.py b/src/maasserver/api/tests/test_boot_source_selections.py
index fd882c8..6a35df6 100644
--- a/src/maasserver/api/tests/test_boot_source_selections.py
+++ b/src/maasserver/api/tests/test_boot_source_selections.py
@@ -32,7 +32,7 @@ def get_boot_source_selection_uri(boot_source_selection):
 
 class TestBootSourceSelectionAPI(APITestCase.ForUser):
     def setUp(self):
-        super(TestBootSourceSelectionAPI, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
@@ -138,7 +138,7 @@ class TestBootSourceSelectionsAPI(APITestCase.ForUser):
     """Test the the boot source selections API."""
 
     def setUp(self):
-        super(TestBootSourceSelectionsAPI, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/api/tests/test_boot_sources.py b/src/maasserver/api/tests/test_boot_sources.py
index 1a0bf8e..c16d8ca 100644
--- a/src/maasserver/api/tests/test_boot_sources.py
+++ b/src/maasserver/api/tests/test_boot_sources.py
@@ -27,7 +27,7 @@ def get_boot_source_uri(boot_source):
 
 class TestBootSourceAPI(APITestCase.ForUser):
     def setUp(self):
-        super(TestBootSourceAPI, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
@@ -116,7 +116,7 @@ class TestBootSourcesAPI(APITestCase.ForUser):
     """Test the the boot source API."""
 
     def setUp(self):
-        super(TestBootSourcesAPI, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/api/tests/test_doc.py b/src/maasserver/api/tests/test_doc.py
index 8e5bca0..770730b 100644
--- a/src/maasserver/api/tests/test_doc.py
+++ b/src/maasserver/api/tests/test_doc.py
@@ -275,7 +275,7 @@ class TestDescribingAPI(MAASTestCase):
     """Tests for functions that describe a Piston API."""
 
     def setUp(self):
-        super(TestDescribingAPI, self).setUp()
+        super().setUp()
         # Override config maas url so that it's stable for testing.
         self.useFixture(
             RegionConfigurationFixture(maas_url="http://example.com/")
@@ -625,7 +625,7 @@ class TestGetAPIDescriptionHash(MAASTestCase):
     """Tests for `get_api_description_hash`."""
 
     def setUp(self):
-        super(TestGetAPIDescriptionHash, self).setUp()
+        super().setUp()
         self.addCleanup(self.clear_hash_cache)
         self.clear_hash_cache()
 
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 242c82c..f95def4 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -94,7 +94,7 @@ class MachinesAPILoggedInTest(APITestCase.ForUserAndAdmin):
     """A logged-in user can access the API."""
 
     def setUp(self):
-        super(MachinesAPILoggedInTest, self).setUp()
+        super().setUp()
         self.patch(node_module, "wait_for_power_command")
         self.patch(node_module.Node, "_start")
 
@@ -121,7 +121,7 @@ class TestMachineAPI(APITestCase.ForUser):
     clientfactories = {"oauth": MAASSensibleOAuthClient}
 
     def setUp(self):
-        super(TestMachineAPI, self).setUp()
+        super().setUp()
         self.patch(node_module.Node, "_pc_power_control_node")
 
     def test_handler_path(self):
diff --git a/src/maasserver/api/tests/test_machines.py b/src/maasserver/api/tests/test_machines.py
index f232844..a914b03 100644
--- a/src/maasserver/api/tests/test_machines.py
+++ b/src/maasserver/api/tests/test_machines.py
@@ -815,7 +815,7 @@ class TestMachinesAPI(APITestCase.ForUser):
 
             def __init__(self, *args, **kwargs):
                 passed_pods.extend(kwargs["pods"])
-                super(FakeComposer, self).__init__(*args, **kwargs)
+                super().__init__(*args, **kwargs)
 
             def compose(self):
                 return factory.make_Node(
@@ -3529,7 +3529,7 @@ class TestMachinesAPI(APITestCase.ForUser):
 
 class TestPowerState(APITransactionTestCase.ForUser):
     def setUp(self):
-        super(TestPowerState, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("database-tasks", "rpc"))
         self.useFixture(RunningEventLoopFixture())
 
diff --git a/src/maasserver/api/tests/test_node.py b/src/maasserver/api/tests/test_node.py
index 72b419b..c49b4ab 100644
--- a/src/maasserver/api/tests/test_node.py
+++ b/src/maasserver/api/tests/test_node.py
@@ -69,7 +69,7 @@ class NodesAPILoggedInTest(APITestCase.ForUserAndAdmin):
     """A logged-in user can access the API."""
 
     def setUp(self):
-        super(NodesAPILoggedInTest, self).setUp()
+        super().setUp()
         self.patch(node_module, "wait_for_power_command")
 
     def test_nodes_GET_logged_in(self):
diff --git a/src/maasserver/bootresources.py b/src/maasserver/bootresources.py
index 3cf6c30..fb4447b 100644
--- a/src/maasserver/bootresources.py
+++ b/src/maasserver/bootresources.py
@@ -1090,7 +1090,7 @@ class BootResourceRepoWriter(BasicMirrorWriter):
         assert isinstance(store, BootResourceStore)
         self.store = store
         self.product_mapping = product_mapping
-        super(BootResourceRepoWriter, self).__init__(
+        super().__init__(
             config={
                 # Only download the latest version. Without this all versions
                 # will be downloaded from simplestreams.
@@ -1507,9 +1507,7 @@ class ImportResourcesService(TimerService, object):
     """
 
     def __init__(self, interval=IMPORT_RESOURCES_SERVICE_PERIOD):
-        super(ImportResourcesService, self).__init__(
-            interval.total_seconds(), self.maybe_import_resources
-        )
+        super().__init__(interval.total_seconds(), self.maybe_import_resources)
 
     def maybe_import_resources(self):
         def determine_auto():
@@ -1543,9 +1541,7 @@ class ImportResourcesProgressService(TimerService, object):
     """Service to periodically check on the progress of boot imports."""
 
     def __init__(self, interval=timedelta(minutes=3)):
-        super(ImportResourcesProgressService, self).__init__(
-            interval.total_seconds(), self.try_check_boot_images
-        )
+        super().__init__(interval.total_seconds(), self.try_check_boot_images)
 
     def try_check_boot_images(self):
         return self.check_boot_images().addErrback(
diff --git a/src/maasserver/clusterrpc/boot_images.py b/src/maasserver/clusterrpc/boot_images.py
index de7f570..68fe1db 100644
--- a/src/maasserver/clusterrpc/boot_images.py
+++ b/src/maasserver/clusterrpc/boot_images.py
@@ -262,7 +262,7 @@ class RackControllersImporter:
         :param proxy: The HTTP/HTTPS proxy to use, or `None`
         :type proxy: :class:`urlparse.ParseResult` or string
         """
-        super(RackControllersImporter, self).__init__()
+        super().__init__()
         self.system_ids = tuple(flatten(system_ids))
         if isinstance(sources, Sequence):
             self.sources = sources
diff --git a/src/maasserver/clusterrpc/tests/test_boot_images.py b/src/maasserver/clusterrpc/tests/test_boot_images.py
index f557025..399fee4 100644
--- a/src/maasserver/clusterrpc/tests/test_boot_images.py
+++ b/src/maasserver/clusterrpc/tests/test_boot_images.py
@@ -156,7 +156,7 @@ class TestGetBootImages(MAASServerTestCase):
     """Tests for `get_boot_images`."""
 
     def setUp(self):
-        super(TestGetBootImages, self).setUp()
+        super().setUp()
         prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def test_calls_ListBootImagesV2_before_ListBootImages(self):
@@ -189,7 +189,7 @@ class TestGetBootImagesTxn(MAASTransactionServerTestCase):
     """Transactional tests for `get_boot_images`."""
 
     def setUp(self):
-        super(TestGetBootImagesTxn, self).setUp()
+        super().setUp()
         prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def test_returns_boot_images(self):
@@ -227,7 +227,7 @@ class TestGetAvailableBootImages(MAASTransactionServerTestCase):
     )
 
     def setUp(self):
-        super(TestGetAvailableBootImages, self).setUp()
+        super().setUp()
         prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def test_returns_boot_images_for_one_cluster(self):
@@ -337,7 +337,7 @@ class TestGetBootImagesFor(MAASTransactionServerTestCase):
     """Tests for `get_boot_images_for`."""
 
     def setUp(self):
-        super(TestGetBootImagesFor, self).setUp()
+        super().setUp()
         prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def make_boot_images(self):
@@ -564,7 +564,7 @@ class TestRackControllersImporterInAction(MAASTransactionServerTestCase):
     """Live tests for `RackControllersImporter`."""
 
     def setUp(self):
-        super(TestRackControllersImporterInAction, self).setUp()
+        super().setUp()
         # Limit the region's event loop to only the "rpc" service.
         self.useFixture(RegionEventLoopFixture("rpc"))
         # Now start the region's event loop.
diff --git a/src/maasserver/config_forms.py b/src/maasserver/config_forms.py
index fc2953b..155e4cd 100644
--- a/src/maasserver/config_forms.py
+++ b/src/maasserver/config_forms.py
@@ -275,7 +275,7 @@ class DictCharWidget(forms.widgets.MultiWidget):
         self.initials = initials
         self.labels = labels
         self.skip_check = skip_check
-        super(DictCharWidget, self).__init__(widgets, attrs)
+        super().__init__(widgets, attrs)
 
     def render(self, name, value, attrs=None):
         # value is a list of values, each corresponding to a widget
diff --git a/src/maasserver/dns/tests/test_config.py b/src/maasserver/dns/tests/test_config.py
index 3d955c7..2e23102 100644
--- a/src/maasserver/dns/tests/test_config.py
+++ b/src/maasserver/dns/tests/test_config.py
@@ -91,7 +91,7 @@ class TestDNSServer(MAASServerTestCase):
     """
 
     def setUp(self):
-        super(TestDNSServer, self).setUp()
+        super().setUp()
         # Ensure there's an initial DNS publication. Outside of tests this is
         # guaranteed by a migration.
         DNSPublication(source="Initial").save()
@@ -482,7 +482,7 @@ class TestGetTrustedAcls(MAASServerTestCase):
     """Test for maasserver/dns/config.py:get_trusted_acls()"""
 
     def setUp(self):
-        super(TestGetTrustedAcls, self).setUp()
+        super().setUp()
         self.useFixture(RegionConfigurationFixture())
 
     def test_returns_empty_string_if_no_networks(self):
@@ -511,7 +511,7 @@ class TestGetTrustedNetworks(MAASServerTestCase):
     """Test for maasserver/dns/config.py:get_trusted_networks()"""
 
     def setUp(self):
-        super(TestGetTrustedNetworks, self).setUp()
+        super().setUp()
         self.useFixture(RegionConfigurationFixture())
 
     def test_returns_empty_string_if_no_networks(self):
diff --git a/src/maasserver/dns/tests/test_zonegenerator.py b/src/maasserver/dns/tests/test_zonegenerator.py
index f47f7d1..0d48710 100644
--- a/src/maasserver/dns/tests/test_zonegenerator.py
+++ b/src/maasserver/dns/tests/test_zonegenerator.py
@@ -329,7 +329,7 @@ class TestZoneGenerator(MAASServerTestCase):
     """Tests for :class:`ZoneGenerator`."""
 
     def setUp(self):
-        super(TestZoneGenerator, self).setUp()
+        super().setUp()
         self.useFixture(RegionConfigurationFixture())
 
     def test_empty_yields_nothing(self):
diff --git a/src/maasserver/dns/zonegenerator.py b/src/maasserver/dns/zonegenerator.py
index cda8222..7decc8d 100644
--- a/src/maasserver/dns/zonegenerator.py
+++ b/src/maasserver/dns/zonegenerator.py
@@ -39,7 +39,7 @@ class lazydict(dict):
     __slots__ = ("factory",)
 
     def __init__(self, factory):
-        super(lazydict, self).__init__()
+        super().__init__()
         self.factory = factory
 
     def __missing__(self, key):
diff --git a/src/maasserver/eventloop.py b/src/maasserver/eventloop.py
index fa18ba6..f5b3e4c 100644
--- a/src/maasserver/eventloop.py
+++ b/src/maasserver/eventloop.py
@@ -392,7 +392,7 @@ class RegionEventLoop:
     }
 
     def __init__(self):
-        super(RegionEventLoop, self).__init__()
+        super().__init__()
         self.services = MAASServices(self)
         self.handle = None
         self.master = False
diff --git a/src/maasserver/exceptions.py b/src/maasserver/exceptions.py
index 8aceaab..e449790 100644
--- a/src/maasserver/exceptions.py
+++ b/src/maasserver/exceptions.py
@@ -189,11 +189,9 @@ class NodeActionError(MAASException):
         from maasserver.clusterrpc.utils import get_error_message_for_exception
 
         if isinstance(error, Exception):
-            super(NodeActionError, self).__init__(
-                get_error_message_for_exception(error)
-            )
+            super().__init__(get_error_message_for_exception(error))
         else:
-            super(NodeActionError, self).__init__(error)
+            super().__init__(error)
 
 
 class UnresolvableHost(MAASException):
diff --git a/src/maasserver/fields.py b/src/maasserver/fields.py
index 8aed123..4623422 100644
--- a/src/maasserver/fields.py
+++ b/src/maasserver/fields.py
@@ -56,7 +56,7 @@ class Field(_BrokenField):
 
     def __init__(self, *args, validators=None, **kwargs):
         kwargs["validators"] = [] if validators is None else validators
-        super(Field, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 MAC_RE = re.compile(
@@ -105,7 +105,7 @@ class StrippedCharField(forms.CharField):
 
     def clean(self, value):
         value = self.to_python(value).strip()
-        return super(StrippedCharField, self).clean(value)
+        return super().clean(value)
 
 
 class UnstrippedCharField(forms.CharField):
@@ -119,7 +119,7 @@ class UnstrippedCharField(forms.CharField):
     def __init__(self, *args, **kwargs):
         # Instead of relying on a version check, we check for CharField
         # constructor having a strip kwarg instead.
-        parent_init = super(UnstrippedCharField, self).__init__
+        parent_init = super().__init__
         if "strip" in parent_init.__code__.co_varnames:
             parent_init(*args, strip=False, **kwargs)
         else:
@@ -135,7 +135,7 @@ class VerboseRegexField(forms.CharField):
         :param regex: Either a string or a compiled regular expression object.
         :param message: Error message to use when the validation fails.
         """
-        super(VerboseRegexField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.validators.append(
             VerboseRegexValidator(regex=regex, message=message)
         )
@@ -145,9 +145,7 @@ class MACAddressFormField(VerboseRegexField):
     """Form field type: MAC address."""
 
     def __init__(self, *args, **kwargs):
-        super(MACAddressFormField, self).__init__(
-            regex=MAC_RE, message=MAC_ERROR_MSG, *args, **kwargs
-        )
+        super().__init__(regex=MAC_RE, message=MAC_ERROR_MSG, *args, **kwargs)
 
 
 class MACAddressField(Field):
@@ -167,7 +165,7 @@ class MACAddressField(Field):
         return MAC(value)
 
     def get_prep_value(self, value):
-        value = super(MACAddressField, self).get_prep_value(value)
+        value = super().get_prep_value(value)
         # Convert empty string to None.
         if not value:
             return None
@@ -188,9 +186,9 @@ class MAC:
         if value is None:
             return None
         elif isinstance(value, (bytes, str)):
-            return None if len(value) == 0 else super(MAC, cls).__new__(cls)
+            return None if len(value) == 0 else super().__new__(cls)
         else:
-            return super(MAC, cls).__new__(cls)
+            return super().__new__(cls)
 
     def __init__(self, value):
         """Wrap a MAC address, or None, into a `MAC`.
@@ -362,7 +360,7 @@ class EditableBinaryField(BinaryField):
     """
 
     def __init__(self, *args, **kwargs):
-        super(EditableBinaryField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.editable = True
 
     def deconstruct(self):
@@ -493,7 +491,7 @@ class LargeObjectField(IntegerField):
 
     def __init__(self, *args, **kwargs):
         self.block_size = kwargs.pop("block_size", 1 << 16)
-        super(LargeObjectField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     @property
     def validators(self):
@@ -508,7 +506,7 @@ class LargeObjectField(IntegerField):
 
     def contribute_to_class(self, cls, name):
         """Set the descriptor for the large object."""
-        super(LargeObjectField, self).contribute_to_class(cls, name)
+        super().contribute_to_class(cls, name)
         setattr(cls, self.name, LargeObjectDescriptor(self))
 
     def get_db_prep_value(self, value, connection=None, prepared=False):
@@ -574,7 +572,7 @@ class CIDRField(Field):
     def formfield(self, **kwargs):
         defaults = {"form_class": forms.CharField}
         defaults.update(kwargs)
-        return super(CIDRField, self).formfield(**defaults)
+        return super().formfield(**defaults)
 
 
 class IPv4CIDRField(CIDRField):
@@ -750,7 +748,7 @@ class CaseInsensitiveChoiceField(forms.ChoiceField):
     def to_python(self, value):
         if value not in self.empty_values:
             value = value.lower()
-        return super(CaseInsensitiveChoiceField, self).to_python(value)
+        return super().to_python(value)
 
 
 class SpecifierOrModelChoiceField(forms.ModelChoiceField):
@@ -760,7 +758,7 @@ class SpecifierOrModelChoiceField(forms.ModelChoiceField):
 
     def to_python(self, value):
         try:
-            return super(SpecifierOrModelChoiceField, self).to_python(value)
+            return super().to_python(value)
         except ValidationError as e:
             if isinstance(value, str):
                 object_id = self.queryset.get_object_id(value)
@@ -794,10 +792,10 @@ class DomainNameField(CharField):
         validators = kwargs.pop("validators", [])
         validators.append(validate_domain_name)
         kwargs["validators"] = validators
-        super(DomainNameField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def deconstruct(self):
-        name, path, args, kwargs = super(DomainNameField, self).deconstruct()
+        name, path, args, kwargs = super().deconstruct()
         del kwargs["validators"]
         return name, path, args, kwargs
 
@@ -808,7 +806,7 @@ class DomainNameField(CharField):
     # https://docs.djangoproject.com/en/1.6/ref/forms/validation/
     # https://code.djangoproject.com/ticket/6362
     def to_python(self, value):
-        value = super(DomainNameField, self).to_python(value)
+        value = super().to_python(value)
         if value is None:
             return None
         value = value.strip().rstrip(".")
diff --git a/src/maasserver/fields_storage.py b/src/maasserver/fields_storage.py
index f010b9f..65b7875 100644
--- a/src/maasserver/fields_storage.py
+++ b/src/maasserver/fields_storage.py
@@ -38,7 +38,7 @@ class BytesOrPercentageField(forms.RegexField):
         self.min_value = kwargs.pop("min_value", None)
         self.max_value = kwargs.pop("max_value", None)
         regex = r"^(%s|%s)$" % (PERCENTAGE_REGEX, BYTES_REGEX)
-        super(BytesOrPercentageField, self).__init__(regex, *args, **kwargs)
+        super().__init__(regex, *args, **kwargs)
 
     def to_python(self, value):
         if value is not None:
@@ -47,7 +47,7 @@ class BytesOrPercentageField(forms.RegexField):
         return value
 
     def clean(self, value):
-        value = super(BytesOrPercentageField, self).clean(value)
+        value = super().clean(value)
         if value is not None:
             # Exit early if this is percentage value.
             if is_percentage(value):
diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index 62e1ecd..3a95695 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -210,7 +210,7 @@ class APIEditMixin:
         self.data = get_overridden_query_dict(
             self.initial, self.data, self.fields
         )
-        super(APIEditMixin, self).full_clean()
+        super().full_clean()
 
     def _post_clean(self):
         """Override Django's private hook _post_save to remove None values
@@ -221,7 +221,7 @@ class APIEditMixin:
         before that.
         """
         self.cleaned_data = remove_None_values(self.cleaned_data)
-        super(APIEditMixin, self)._post_clean()
+        super()._post_clean()
 
 
 class WithPowerTypeMixin:
@@ -232,7 +232,7 @@ class WithPowerTypeMixin:
     """
 
     def __init__(self, *args, **kwargs):
-        super(WithPowerTypeMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.data = self.data.copy()
         WithPowerTypeMixin.set_up_power_fields(self, self.data)
 
@@ -377,12 +377,12 @@ class WithPowerTypeMixin:
             )
 
     def clean(self):
-        cleaned_data = super(WithPowerTypeMixin, self).clean()
+        cleaned_data = super().clean()
         return WithPowerTypeMixin.check_driver(self, cleaned_data)
 
     def save(self, *args, **kwargs):
         """Persist the node into the database."""
-        node = super(WithPowerTypeMixin, self).save()
+        node = super().save()
         WithPowerTypeMixin.set_values(self, node)
         node.save()
         return node
@@ -423,7 +423,7 @@ class MAASModelForm(
     """
 
     def __init__(self, data=None, files=None, ui_submission=False, **kwargs):
-        super(MAASModelForm, self).__init__(data=data, files=files, **kwargs)
+        super().__init__(data=data, files=files, **kwargs)
         self.is_update = bool(kwargs.get("instance", None))
         if ui_submission:
             # Add the ui_submission field.  Insert it before the other fields,
@@ -448,7 +448,7 @@ class MAASModelForm(
             error_dict = errors
         else:
             error_dict = ValidationError({NON_FIELD_ERRORS: errors})
-        super(MAASModelForm, self)._update_errors(error_dict)
+        super()._update_errors(error_dict)
 
     def use_perms(self):
         """Return True if the form should use permissions."""
@@ -607,7 +607,7 @@ class CheckboxInputTrueDefault(CheckboxInput):
 
 class NodeForm(MAASModelForm):
     def __init__(self, request=None, *args, **kwargs):
-        super(NodeForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # Even though it doesn't need it and doesn't use it, this form accepts
         # a parameter named 'request' because it is used interchangingly
@@ -711,7 +711,7 @@ class NodeForm(MAASModelForm):
 
 class MachineForm(NodeForm):
     def __init__(self, request=None, requires_arch=False, *args, **kwargs):
-        super(MachineForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # Even though it doesn't need it and doesn't use it, this form accepts
         # a parameter named 'request' because it is used interchangingly
@@ -817,7 +817,7 @@ class MachineForm(NodeForm):
         return validate_min_hwe_kernel(min_hwe_kernel)
 
     def clean(self):
-        cleaned_data = super(MachineForm, self).clean()
+        cleaned_data = super().clean()
 
         if not self.instance.hwe_kernel:
             osystem = cleaned_data.get("osystem")
@@ -838,7 +838,7 @@ class MachineForm(NodeForm):
         return cleaned_data
 
     def is_valid(self):
-        is_valid = super(MachineForm, self).is_valid()
+        is_valid = super().is_valid()
         if not is_valid:
             return False
         if len(list_all_usable_architectures()) == 0:
@@ -922,7 +922,7 @@ class MachineForm(NodeForm):
         commission = not self.instance.id and self.cleaned_data["commission"]
         if commission:
             self.instance.status = NODE_STATUS.COMMISSIONING
-        machine = super(MachineForm, self).save(*args, **kwargs)
+        machine = super().save(*args, **kwargs)
         # For a ScriptSet to be created it must be associated with a Node
         # object in the database.
         if commission:
@@ -975,7 +975,7 @@ class DeviceForm(NodeForm):
         fields = NodeForm.Meta.fields + ("description", "parent", "zone")
 
     def __init__(self, request=None, *args, **kwargs):
-        super(DeviceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.request = request
 
         instance = kwargs.get("instance")
@@ -988,7 +988,7 @@ class DeviceForm(NodeForm):
         return user.has_perm(NodePermission.view)
 
     def save(self, commit=True):
-        device = super(DeviceForm, self).save(commit=False)
+        device = super().save(commit=False)
         device.node_type = NODE_TYPE.DEVICE
         if self.new_node:
             # Set the owner: devices are owned by their creator.
@@ -1032,21 +1032,19 @@ class ControllerForm(MAASModelForm, WithPowerTypeMixin):
     )
 
     def __init__(self, data=None, instance=None, request=None, **kwargs):
-        super(ControllerForm, self).__init__(
-            data=data, instance=instance, **kwargs
-        )
+        super().__init__(data=data, instance=instance, **kwargs)
         WithPowerTypeMixin.set_up_power_fields(self, data, instance)
         if instance is not None:
             self.initial["zone"] = instance.zone.name
             self.initial["domain"] = instance.domain.name
 
     def clean(self):
-        cleaned_data = super(ControllerForm, self).clean()
+        cleaned_data = super().clean()
         return WithPowerTypeMixin.check_driver(self, cleaned_data)
 
     def save(self, *args, **kwargs):
         """Persist the node into the database."""
-        controller = super(ControllerForm, self).save(commit=False)
+        controller = super().save(commit=False)
         zone = self.cleaned_data.get("zone")
         if zone:
             controller.zone = zone
@@ -1094,9 +1092,7 @@ class AdminNodeForm(NodeForm):
         fields = NodeForm.Meta.fields + ("cpu_count", "description", "memory")
 
     def __init__(self, data=None, instance=None, request=None, **kwargs):
-        super(AdminNodeForm, self).__init__(
-            data=data, instance=instance, **kwargs
-        )
+        super().__init__(data=data, instance=instance, **kwargs)
         self.request = request
         self.set_up_initial_zone(instance)
         # The zone field is not required because we want to be able
@@ -1119,7 +1115,7 @@ class AdminNodeForm(NodeForm):
 
     def save(self, *args, **kwargs):
         """Persist the node into the database."""
-        node = super(AdminNodeForm, self).save(commit=False)
+        node = super().save(commit=False)
         zone = self.cleaned_data.get("zone")
         if zone:
             node.zone = zone
@@ -1145,18 +1141,16 @@ class AdminMachineForm(MachineForm, AdminNodeForm, WithPowerTypeMixin):
         )
 
     def __init__(self, data=None, instance=None, request=None, **kwargs):
-        super(AdminMachineForm, self).__init__(
-            data=data, instance=instance, **kwargs
-        )
+        super().__init__(data=data, instance=instance, **kwargs)
         WithPowerTypeMixin.set_up_power_fields(self, data, instance)
 
     def clean(self):
-        cleaned_data = super(AdminMachineForm, self).clean()
+        cleaned_data = super().clean()
         return WithPowerTypeMixin.check_driver(self, cleaned_data)
 
     def save(self, *args, **kwargs):
         """Persist the node into the database."""
-        machine = super(AdminMachineForm, self).save(commit=False)
+        machine = super().save(commit=False)
         zone = self.cleaned_data.get("zone")
         if zone:
             machine.zone = zone
@@ -1188,7 +1182,7 @@ class KeyForm(MAASModelForm):
     """Base class for `SSHKeyForm` and `SSLKeyForm`."""
 
     def __init__(self, user, *args, **kwargs):
-        super(KeyForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.user = user
 
     def validate_unique(self):
@@ -1233,7 +1227,7 @@ class SSHKeyForm(MAASModelForm):
         self.instance.user = user
 
     def save(self, endpoint, request):
-        sshkey = super(SSHKeyForm, self).save()
+        sshkey = super().save()
         if self.instance.user is request.user:
             description = "Created SSH key."
         else:
@@ -1260,7 +1254,7 @@ class SSLKeyForm(KeyForm):
         fields = ["key"]
 
     def save(self, endpoint, request):
-        sslkey = super(SSLKeyForm, self).save()
+        sslkey = super().save()
         create_audit_event(
             EVENT_TYPES.AUTHORISATION,
             endpoint,
@@ -1274,7 +1268,7 @@ class SSLKeyForm(KeyForm):
 class MultipleMACAddressField(forms.MultiValueField):
     def __init__(self, nb_macs=1, *args, **kwargs):
         fields = [MACAddressFormField() for _ in range(nb_macs)]
-        super(MultipleMACAddressField, self).__init__(fields, *args, **kwargs)
+        super().__init__(fields, *args, **kwargs)
 
     def compress(self, data_list):
         if data_list:
@@ -1326,7 +1320,7 @@ class WithMACAddressesMixin:
     """
 
     def __init__(self, *args, **kwargs):
-        super(WithMACAddressesMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # This is a workaround for a Django bug in which self.data (which is
         # supposed to be a QueryDict) ends up being a normal Python dict.
         # This class requires a QueryDict (which it seems like Django should
@@ -1344,7 +1338,7 @@ class WithMACAddressesMixin:
         self.data["mac_addresses"] = macs
 
     def is_valid(self):
-        valid = super(WithMACAddressesMixin, self).is_valid()
+        valid = super().is_valid()
         # If the number of MAC address fields is > 1, provide a unified
         # error message if the validation has failed.
         reformat_mac_address_error = (
@@ -1396,7 +1390,7 @@ class WithMACAddressesMixin:
 
         This implementation of `save` does not support the `commit` argument.
         """
-        node = super(WithMACAddressesMixin, self).save()
+        node = super().save()
         architecture = self.cleaned_data.get("architecture")
         power_type = self.cleaned_data.get("power_type")
         # If a new node with an IPMI BMC is created the user doesn't have
@@ -1516,7 +1510,7 @@ class NewUserCreationForm(UserCreationForm):
             self.cleaned_data["password2"] = None
 
     def save(self, commit=True):
-        user = super(NewUserCreationForm, self).save(commit=False)
+        user = super().save(commit=False)
         if self.cleaned_data.get("is_superuser", False):
             user.is_superuser = True
         new_last_name = self.cleaned_data.get("last_name", None)
@@ -1555,7 +1549,7 @@ class EditUserForm(UserChangeForm):
         fields = ("username", "last_name", "email", "is_superuser")
 
     def __init__(self, *args, **kwargs):
-        super(EditUserForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # Django 1.4 overrides the field 'password' thus adding it
         # post-facto to the list of the selected fields (Meta.fields).
         # Here we don't want to use this form to edit the password.
@@ -1583,7 +1577,7 @@ class ConfigForm(Form):
     config_fields = None
 
     def __init__(self, *args, **kwargs):
-        super(ConfigForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if "initial" not in kwargs:
             self._load_initials()
 
@@ -1757,7 +1751,7 @@ class DeployForm(ConfigForm):
         return field
 
     def _load_initials(self):
-        super(DeployForm, self)._load_initials()
+        super()._load_initials()
         initial_os = self.fields["default_osystem"].initial
         initial_series = self.fields["default_distro_series"].initial
         self.initial["default_distro_series"] = "%s/%s" % (
@@ -1792,7 +1786,7 @@ class UbuntuForm(Form):
     )
 
     def __init__(self, *args, **kwargs):
-        super(UbuntuForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._load_initials()
 
     def _load_initials(self):
@@ -1912,7 +1906,7 @@ class ValidatorMultipleChoiceField(MultipleChoiceField):
     """A MultipleChoiceField validating each given choice with a validator."""
 
     def __init__(self, validator, **kwargs):
-        super(ValidatorMultipleChoiceField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.validator = validator
 
     def validate(self, values):
@@ -1950,7 +1944,7 @@ class InstanceListField(UnconstrainedMultipleChoiceField):
             the names that didn't correspond to a valid instance
             respectively.
         """
-        super(InstanceListField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.model_class = model_class
         self.field_name = field_name
         if text_for_invalid_object is None:
@@ -1989,7 +1983,7 @@ class BulkNodeSetZoneForm(Form):
     system_id = UnconstrainedMultipleChoiceField()
 
     def __init__(self, user, request=None, *args, **kwargs):
-        super(BulkNodeSetZoneForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.user = user
         self.request = request
         self.fields["zone"] = forms.ModelChoiceField(
@@ -2114,7 +2108,7 @@ class BootSourceForm(MAASModelForm):
     )
 
     def __init__(self, **kwargs):
-        super(BootSourceForm, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def clean_keyring_data(self):
         """Process 'keyring_data' field.
@@ -2144,14 +2138,14 @@ class BootSourceSelectionForm(MAASModelForm):
     labels = UnconstrainedMultipleChoiceField(label="Label list")
 
     def __init__(self, boot_source=None, **kwargs):
-        super(BootSourceSelectionForm, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         if "instance" in kwargs:
             self.boot_source = kwargs["instance"].boot_source
         else:
             self.boot_source = boot_source
 
     def clean(self):
-        cleaned_data = super(BootSourceSelectionForm, self).clean()
+        cleaned_data = super().clean()
 
         # Don't filter on OS if not provided. This is to maintain
         # backwards compatibility for when OS didn't exist in the API.
@@ -2216,9 +2210,7 @@ class BootSourceSelectionForm(MAASModelForm):
         return cleaned_data
 
     def save(self, *args, **kwargs):
-        boot_source_selection = super(BootSourceSelectionForm, self).save(
-            commit=False
-        )
+        boot_source_selection = super().save(commit=False)
         boot_source_selection.boot_source = self.boot_source
         if kwargs.get("commit", True):
             boot_source_selection.save()
@@ -2233,7 +2225,7 @@ class LicenseKeyForm(MAASModelForm):
         fields = ("osystem", "distro_series", "license_key")
 
     def __init__(self, *args, **kwargs):
-        super(LicenseKeyForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.set_up_osystem_and_distro_series_fields(kwargs.get("instance"))
 
     def set_up_osystem_and_distro_series_fields(self, instance):
@@ -2286,7 +2278,7 @@ class LicenseKeyForm(MAASModelForm):
         for selected operating system and series."""
         # Get the clean_data, check that all of the fields we need are
         # present. If not then the form will error, so no reason to continue.
-        cleaned_data = super(LicenseKeyForm, self).clean()
+        cleaned_data = super().clean()
         required_fields = ["license_key", "osystem", "distro_series"]
         for field in required_fields:
             if field not in cleaned_data:
@@ -2357,7 +2349,7 @@ class BootResourceForm(MAASModelForm):
     keep_old = forms.BooleanField(required=False)
 
     def __init__(self, *args, **kwargs):
-        super(BootResourceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.set_up_architecture_field()
 
     def set_up_architecture_field(self):
@@ -2502,7 +2494,7 @@ class BootResourceForm(MAASModelForm):
 
         This implementation of `save` does not support the `commit` argument.
         """
-        resource = super(BootResourceForm, self).save(commit=False)
+        resource = super().save(commit=False)
         resource.rtype = BOOT_RESOURCE_TYPE.UPLOADED
         resource = self.get_existing_resource(resource)
         resource.extra = {"subarches": resource.architecture.split("/")[1]}
@@ -2546,7 +2538,7 @@ class BootResourceNoContentForm(BootResourceForm):
     size = forms.IntegerField(label="Size", required=True)
 
     def __init__(self, *args, **kwargs):
-        super(BootResourceNoContentForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # Remove content field, as this form does not use it
         del self.fields["content"]
 
@@ -2609,7 +2601,7 @@ class UUID4Field(forms.RegexField):
         )
         kwargs["min_length"] = 32
         kwargs["max_length"] = 36
-        super(UUID4Field, self).__init__(regex, *args, **kwargs)
+        super().__init__(regex, *args, **kwargs)
 
 
 class AbsolutePathField(forms.RegexField):
@@ -2632,7 +2624,7 @@ class AbsolutePathField(forms.RegexField):
         # large.
         #
         kwargs["max_length"] = 4095
-        super(AbsolutePathField, self).__init__(regex, *args, **kwargs)
+        super().__init__(regex, *args, **kwargs)
 
 
 class BytesField(forms.RegexField):
@@ -2648,7 +2640,7 @@ class BytesField(forms.RegexField):
         else:
             self.max_value = None
         regex = r"^-?[0-9]+([KkMmGgTtPpEe]{1})?$"
-        super(BytesField, self).__init__(regex, *args, **kwargs)
+        super().__init__(regex, *args, **kwargs)
 
     def to_python(self, value):
         if value is not None:
@@ -2657,7 +2649,7 @@ class BytesField(forms.RegexField):
         return value
 
     def clean(self, value):
-        value = super(BytesField, self).clean(value)
+        value = super().clean(value)
         if value is not None:
             value = machine_readable_bytes(value)
 
@@ -2683,7 +2675,7 @@ class FormatBlockDeviceForm(Form):
     label = forms.CharField(required=False)
 
     def __init__(self, block_device, *args, **kwargs):
-        super(FormatBlockDeviceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.block_device = block_device
         self.node = block_device.get_node()
 
@@ -2691,7 +2683,7 @@ class FormatBlockDeviceForm(Form):
         """Validate block device doesn't have a partition table."""
         # Get the clean_data, check that all of the fields we need are
         # present. If not then the form will error, so no reason to continue.
-        cleaned_data = super(FormatBlockDeviceForm, self).clean()
+        cleaned_data = super().clean()
         if "fstype" not in cleaned_data:
             return cleaned_data
         partition_table = PartitionTable.objects.filter(
@@ -2743,7 +2735,7 @@ class AddPartitionForm(Form):
     uuid = UUID4Field(required=False)
 
     def __init__(self, block_device, *args, **kwargs):
-        super(AddPartitionForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.block_device = block_device
         self.set_up_fields()
 
@@ -2779,7 +2771,7 @@ class FormatPartitionForm(Form):
     label = forms.CharField(required=False)
 
     def __init__(self, partition, *args, **kwargs):
-        super(FormatPartitionForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.partition = partition
         self.node = partition.get_node()
 
@@ -3001,7 +2993,7 @@ class UpdateVirtualBlockDeviceForm(
         fields = ["name", "uuid", "size"]
 
     def clean(self):
-        cleaned_data = super(UpdateVirtualBlockDeviceForm, self).clean()
+        cleaned_data = super().clean()
         is_logical_volume = self.instance.filesystem_group.is_lvm()
         size_has_changed = (
             "size" in self.cleaned_data
@@ -3158,12 +3150,12 @@ class CreateCacheSetForm(Form):
     clean_cache_partition = clean_partition_name_to_id("cache_partition")
 
     def __init__(self, node, *args, **kwargs):
-        super(CreateCacheSetForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.node = node
         self._set_up_field_choices()
 
     def clean(self):
-        cleaned_data = super(CreateCacheSetForm, self).clean()
+        cleaned_data = super().clean()
         cache_device = self.cleaned_data.get("cache_device")
         cache_partition = self.cleaned_data.get("cache_partition")
         if cache_device and cache_partition:
@@ -3234,13 +3226,13 @@ class UpdateCacheSetForm(Form):
     clean_cache_partition = clean_partition_name_to_id("cache_partition")
 
     def __init__(self, cache_set, *args, **kwargs):
-        super(UpdateCacheSetForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.cache_set = cache_set
         self.node = cache_set.get_node()
         self._set_up_field_choices()
 
     def clean(self):
-        cleaned_data = super(UpdateCacheSetForm, self).clean()
+        cleaned_data = super().clean()
         if self.cleaned_data.get("cache_device") and self.cleaned_data.get(
             "cache_partition"
         ):
@@ -3321,13 +3313,13 @@ class CreateBcacheForm(Form):
     clean_cache_set = clean_cache_set_name_to_id("cache_set")
 
     def __init__(self, node, *args, **kwargs):
-        super(CreateBcacheForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.node = node
         self._set_up_field_choices()
 
     def clean(self):
         """Makes sure the Bcache is sensible."""
-        cleaned_data = super(CreateBcacheForm, self).clean()
+        cleaned_data = super().clean()
         Bcache.objects.validate_bcache_creation_parameters(
             cache_set=self.cleaned_data.get("cache_set"),
             cache_mode=self.cleaned_data.get("cache_mode"),
@@ -3407,7 +3399,7 @@ class UpdateBcacheForm(Form):
     clean_cache_set = clean_cache_set_name_to_id("cache_set")
 
     def __init__(self, bcache, *args, **kwargs):
-        super(UpdateBcacheForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.bcache = bcache
         self.node = bcache.get_node()
         self._set_up_field_choices()
@@ -3572,12 +3564,12 @@ class CreateRaidForm(Form):
         self.fields["spare_partitions"].choices = partition_choices
 
     def __init__(self, node, *args, **kwargs):
-        super(CreateRaidForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.node = node
         self._set_up_field_choices()
 
     def clean(self):
-        cleaned_data = super(CreateRaidForm, self).clean()
+        cleaned_data = super().clean()
         # It is not possible to create a RAID without any devices or
         # partitions, but we catch this situation here in order to provide a
         # clearer error message.
@@ -3678,7 +3670,7 @@ class UpdateRaidForm(Form):
     )
 
     def __init__(self, raid, *args, **kwargs):
-        super(UpdateRaidForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.raid = raid
         self.set_up_field_choices()
 
@@ -3858,7 +3850,7 @@ class CreateVolumeGroupForm(Form):
     clean_partitions = clean_partition_names_to_ids("partitions")
 
     def __init__(self, node, *args, **kwargs):
-        super(CreateVolumeGroupForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.node = node
         self.set_up_choice_fields()
 
@@ -3885,7 +3877,7 @@ class CreateVolumeGroupForm(Form):
 
     def clean(self):
         """Validate that at least one block device or partition is given."""
-        cleaned_data = super(CreateVolumeGroupForm, self).clean()
+        cleaned_data = super().clean()
         if "name" not in cleaned_data:
             return cleaned_data
         has_block_devices = (
@@ -3951,7 +3943,7 @@ class UpdateVolumeGroupForm(Form):
     clean_remove_partitions = clean_partition_names_to_ids("remove_partitions")
 
     def __init__(self, volume_group, *args, **kwargs):
-        super(UpdateVolumeGroupForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.volume_group = volume_group
         self.set_up_choice_fields()
 
@@ -4047,7 +4039,7 @@ class CreateLogicalVolumeForm(Form):
     uuid = UUID4Field(required=False)
 
     def __init__(self, volume_group, *args, **kwargs):
-        super(CreateLogicalVolumeForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.volume_group = volume_group
         self.set_up_fields()
 
@@ -4064,7 +4056,7 @@ class CreateLogicalVolumeForm(Form):
 
     def clean(self):
         """Validate that at least one block device or partition is given."""
-        cleaned_data = super(CreateLogicalVolumeForm, self).clean()
+        cleaned_data = super().clean()
         if self.volume_group.get_lvm_free_space() < MIN_BLOCK_DEVICE_SIZE:
             # Remove the size errors. They are confusing because the
             # minimum is larger than the maximum.
diff --git a/src/maasserver/forms/dhcpsnippet.py b/src/maasserver/forms/dhcpsnippet.py
index 725af9f..b5e3cd0 100644
--- a/src/maasserver/forms/dhcpsnippet.py
+++ b/src/maasserver/forms/dhcpsnippet.py
@@ -134,7 +134,7 @@ class DHCPSnippetForm(MAASModelForm):
         return valid
 
     def save(self, endpoint, request):
-        dhcp_snippet = super(DHCPSnippetForm, self).save()
+        dhcp_snippet = super().save()
         create_audit_event(
             EVENT_TYPES.SETTINGS,
             endpoint,
diff --git a/src/maasserver/forms/filesystem.py b/src/maasserver/forms/filesystem.py
index c347e2e..b91eca6 100644
--- a/src/maasserver/forms/filesystem.py
+++ b/src/maasserver/forms/filesystem.py
@@ -25,7 +25,7 @@ class MountFilesystemForm(Form):
 
     @typed
     def __init__(self, filesystem: Optional[Filesystem], *args, **kwargs):
-        super(MountFilesystemForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.filesystem = filesystem
         self.setup()
 
@@ -36,7 +36,7 @@ class MountFilesystemForm(Form):
             self.fields["mount_options"] = StrippedCharField(required=False)
 
     def clean(self):
-        cleaned_data = super(MountFilesystemForm, self).clean()
+        cleaned_data = super().clean()
         if self.filesystem is None:
             self.add_error(
                 None,
@@ -76,7 +76,7 @@ class MountNonStorageFilesystemForm(Form):
 
     @typed
     def __init__(self, node: Node, *args, **kwargs):
-        super(MountNonStorageFilesystemForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.node = node
 
     @typed
@@ -99,11 +99,11 @@ class UnmountNonStorageFilesystemForm(Form):
 
     @typed
     def __init__(self, node: Node, *args, **kwargs):
-        super(UnmountNonStorageFilesystemForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.node = node
 
     def clean(self):
-        cleaned_data = super(UnmountNonStorageFilesystemForm, self).clean()
+        cleaned_data = super().clean()
         if "mount_point" in cleaned_data:
             try:
                 self.filesystem = Filesystem.objects.get(
diff --git a/src/maasserver/forms/interface.py b/src/maasserver/forms/interface.py
index 4397a18..c29b041 100644
--- a/src/maasserver/forms/interface.py
+++ b/src/maasserver/forms/interface.py
@@ -92,7 +92,7 @@ class InterfaceForm(MAASModelForm):
 
     def __init__(self, *args, **kwargs):
         self.node = kwargs.pop("node", None)
-        super(InterfaceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         instance = kwargs.get("instance")
         if instance is not None:
             self.node = instance.get_node()
@@ -109,12 +109,12 @@ class InterfaceForm(MAASModelForm):
         # get the validation to pass on a newly created interface is to set the
         # node in the interface here.
         self.instance.node = self.node
-        return super(InterfaceForm, self)._get_validation_exclusions()
+        return super()._get_validation_exclusions()
 
     def save(self, *args, **kwargs):
         """Persist the interface into the database."""
         created = self.instance.id is None
-        interface = super(InterfaceForm, self).save(commit=True)
+        interface = super().save(commit=True)
         if "parents" in self.data:
             parents = self.cleaned_data.get("parents")
             existing_parents = set(interface.parents.all())
@@ -194,7 +194,7 @@ class InterfaceForm(MAASModelForm):
             )
 
     def clean(self):
-        cleaned_data = super(InterfaceForm, self).clean()
+        cleaned_data = super().clean()
         self.clean_parents_all_same_node(cleaned_data.get("parents"))
         if self.node.node_type == NODE_TYPE.DEVICE:
             cleaned_data = self.clean_device(cleaned_data)
@@ -235,14 +235,14 @@ class ControllerInterfaceForm(MAASModelForm):
         fields = ("vlan", "link_connected", "interface_speed", "link_speed")
 
     def __init__(self, *args, **kwargs):
-        super(ControllerInterfaceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         instance = kwargs.get("instance")
         if instance is not None:
             self.link_connected = instance.link_connected
 
     def save(self, *args, **kwargs):
         """Persist the interface into the database."""
-        interface = super(ControllerInterfaceForm, self).save(commit=False)
+        interface = super().save(commit=False)
         # Allow setting the VLAN to None.
         new_vlan = self.cleaned_data.get("vlan")
         vlan_was_set = "vlan" in self.data
@@ -285,7 +285,7 @@ class DeployedInterfaceForm(MAASModelForm):
         )
 
     def __init__(self, *args, **kwargs):
-        super(DeployedInterfaceForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         instance = kwargs.get("instance")
         if instance is not None:
             self.link_connected = instance.link_connected
@@ -400,7 +400,7 @@ class VLANInterfaceForm(InterfaceForm):
         return new_vlan
 
     def clean(self):
-        cleaned_data = super(VLANInterfaceForm, self).clean()
+        cleaned_data = super().clean()
         if self.fields_ok(["vlan", "parents"]):
             new_vlan = self.cleaned_data.get("vlan")
             if new_vlan:
diff --git a/src/maasserver/forms/interface_link.py b/src/maasserver/forms/interface_link.py
index 71365ce..e6042b1 100644
--- a/src/maasserver/forms/interface_link.py
+++ b/src/maasserver/forms/interface_link.py
@@ -57,7 +57,7 @@ class InterfaceLinkForm(forms.Form):
         ]
 
         self.instance = kwargs.pop("instance")
-        super(InterfaceLinkForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # Create the mode field and setup the queryset on the subnet.
         self.fields["mode"] = CaseInsensitiveChoiceField(
@@ -87,7 +87,7 @@ class InterfaceLinkForm(forms.Form):
                         "bond(%s)." % (self.instance.name, interface_set.name)
                     ),
                 )
-        cleaned_data = super(InterfaceLinkForm, self).clean()
+        cleaned_data = super().clean()
         mode = cleaned_data.get("mode", None)
         if mode is None:
             return cleaned_data
@@ -240,7 +240,7 @@ class InterfaceUnlinkForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         self.instance = kwargs.pop("instance")
-        super(InterfaceUnlinkForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.set_up_id_field()
 
     def set_up_id_field(self):
@@ -266,7 +266,7 @@ class InterfaceSetDefaultGatwayForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         self.instance = kwargs.pop("instance")
-        super(InterfaceSetDefaultGatwayForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.links = self.get_valid_links()
         self.set_up_link_id_field()
 
@@ -327,7 +327,7 @@ class InterfaceSetDefaultGatwayForm(forms.Form):
 
     def clean(self):
         self._clean_has_gateways()
-        cleaned_data = super(InterfaceSetDefaultGatwayForm, self).clean()
+        cleaned_data = super().clean()
         link_id = cleaned_data.get("link_id", None)
         if not link_id:
             self._clean_ipv4_and_ipv6_gateways()
diff --git a/src/maasserver/forms/packagerepository.py b/src/maasserver/forms/packagerepository.py
index 795726f..20ad1f7 100644
--- a/src/maasserver/forms/packagerepository.py
+++ b/src/maasserver/forms/packagerepository.py
@@ -176,7 +176,7 @@ class PackageRepositoryForm(MAASModelForm):
         return values
 
     def save(self, endpoint, request):
-        package_repository = super(PackageRepositoryForm, self).save()
+        package_repository = super().save()
         create_audit_event(
             EVENT_TYPES.SETTINGS,
             endpoint,
diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index 03a62e3..a9ad673 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -211,7 +211,7 @@ class PodForm(MAASModelForm):
         self.is_new = instance is None
         self.request = request
         self.user = user
-        super(PodForm, self).__init__(data=data, instance=instance, **kwargs)
+        super().__init__(data=data, instance=instance, **kwargs)
         if data is None:
             data = {}
         type_value = data.get("type", self.initial.get("type"))
@@ -253,7 +253,7 @@ class PodForm(MAASModelForm):
         """Override to dynamically add fields based on the value of `type`
         field."""
         # Process the built-in fields first.
-        super(PodForm, self)._clean_fields()
+        super()._clean_fields()
         # If no errors then we re-process with the fields required by the
         # selected type for the pod.
         if len(self.errors) == 0:
@@ -268,10 +268,10 @@ class PodForm(MAASModelForm):
                 for key, value in self.instance.power_parameters.items():
                     if key not in self.data:
                         self.data[key] = value
-            super(PodForm, self)._clean_fields()
+            super()._clean_fields()
 
     def clean(self):
-        cleaned_data = super(PodForm, self).clean()
+        cleaned_data = super().clean()
         if len(self.drivers) == 0:
             set_form_error(
                 self,
@@ -508,7 +508,7 @@ class ComposeMachineForm(forms.Form):
         self.pod = kwargs.pop("pod", None)
         if self.pod is None:
             raise ValueError("'pod' kwargs is required.")
-        super(ComposeMachineForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # Build the fields based on the pod and current pod hints.
         self.fields["cores"] = IntegerField(
@@ -858,7 +858,7 @@ class ComposeMachineForPodsForm(forms.Form):
         self.pods = kwargs.pop("pods", None)
         if self.pods is None:
             raise ValueError("'pods' kwargs is required.")
-        super(ComposeMachineForPodsForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.pod_forms = [
             ComposeMachineForm(request=self.request, data=self.data, pod=pod)
             for pod in self.pods
diff --git a/src/maasserver/forms/script.py b/src/maasserver/forms/script.py
index e8f3504..a01cc7b 100644
--- a/src/maasserver/forms/script.py
+++ b/src/maasserver/forms/script.py
@@ -536,7 +536,7 @@ class ScriptForm(ModelForm):
     def save(self, *args, **kwargs):
         request = kwargs.pop("request", None)
         endpoint = kwargs.pop("endpoint", None)
-        script = super(ScriptForm, self).save(*args, **kwargs)
+        script = super().save(*args, **kwargs)
 
         # Create audit event log if endpoint and request supplied.
         if request is not None and endpoint is not None:
diff --git a/src/maasserver/forms/settings.py b/src/maasserver/forms/settings.py
index 49d47c6..f03eb04 100644
--- a/src/maasserver/forms/settings.py
+++ b/src/maasserver/forms/settings.py
@@ -267,7 +267,7 @@ class RemoteSyslogField(forms.CharField):
     """
 
     def clean(self, value):
-        value = super(RemoteSyslogField, self).clean(value)
+        value = super().clean(value)
         if not value:
             return None
         host, port = splithost(value)
diff --git a/src/maasserver/forms/staticroute.py b/src/maasserver/forms/staticroute.py
index fa95a9b..10d45ec 100644
--- a/src/maasserver/forms/staticroute.py
+++ b/src/maasserver/forms/staticroute.py
@@ -36,7 +36,7 @@ class StaticRouteForm(MAASModelForm):
         fields = ("source", "destination", "gateway_ip", "metric")
 
     def __init__(self, *args, **kwargs):
-        super(StaticRouteForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # Metric field is not a required field, but is required in the model.
         self.fields["metric"].required = False
 
diff --git a/src/maasserver/forms/subnet.py b/src/maasserver/forms/subnet.py
index 7fd8f57..6c8a941 100644
--- a/src/maasserver/forms/subnet.py
+++ b/src/maasserver/forms/subnet.py
@@ -57,11 +57,11 @@ class SubnetForm(MAASModelForm):
         )
 
     def __init__(self, *args, **kwargs):
-        super(SubnetForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.fields["name"].required = False
 
     def clean(self):
-        cleaned_data = super(SubnetForm, self).clean()
+        cleaned_data = super().clean()
         if "space" in self.data:
             set_form_error(
                 self,
diff --git a/src/maasserver/forms/tests/test_bootsource.py b/src/maasserver/forms/tests/test_bootsource.py
index c739c06..2a1d683 100644
--- a/src/maasserver/forms/tests/test_bootsource.py
+++ b/src/maasserver/forms/tests/test_bootsource.py
@@ -21,7 +21,7 @@ class TestBootSourceForm(MAASServerTestCase):
     """Tests for `BootSourceForm`."""
 
     def setUp(self):
-        super(TestBootSourceForm, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/forms/tests/test_bootsourceselection.py b/src/maasserver/forms/tests/test_bootsourceselection.py
index ca6a0c2..e77bf44 100644
--- a/src/maasserver/forms/tests/test_bootsourceselection.py
+++ b/src/maasserver/forms/tests/test_bootsourceselection.py
@@ -18,7 +18,7 @@ class TestBootSourceSelectionForm(MAASServerTestCase):
     """Tests for `BootSourceSelectionForm`."""
 
     def setUp(self):
-        super(TestBootSourceSelectionForm, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/forms/tests/test_helpers.py b/src/maasserver/forms/tests/test_helpers.py
index 92347b6..33ee0ab 100644
--- a/src/maasserver/forms/tests/test_helpers.py
+++ b/src/maasserver/forms/tests/test_helpers.py
@@ -170,7 +170,7 @@ class TestMAASModelForm(MAASLegacyTransactionServerTestCase):
             """
 
             def __init__(self, *args, **kwargs):
-                super(EarlyFieldMixin, self).__init__(*args, **kwargs)
+                super().__init__(*args, **kwargs)
                 self.fields["early_field"] = CharField(required=False)
 
         class TestForm(EarlyFieldMixin, MAASModelForm):
diff --git a/src/maasserver/forms/vlan.py b/src/maasserver/forms/vlan.py
index 5c1f67e..80c49b5 100644
--- a/src/maasserver/forms/vlan.py
+++ b/src/maasserver/forms/vlan.py
@@ -46,7 +46,7 @@ class VLANForm(MAASModelForm):
 
     def __init__(self, *args, **kwargs):
         self.fabric = kwargs.pop("fabric", None)
-        super(VLANForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         instance = kwargs.get("instance")
         if instance is None and self.fabric is None:
             raise ValueError("Form requires either a instance or a fabric.")
@@ -99,7 +99,7 @@ class VLANForm(MAASModelForm):
         )
 
     def clean(self):
-        cleaned_data = super(VLANForm, self).clean()
+        cleaned_data = super().clean()
         # Automatically promote the secondary rack controller to the primary
         # if the primary is removed.
         if (
@@ -199,7 +199,7 @@ class VLANForm(MAASModelForm):
 
     def save(self):
         """Persist the VLAN into the database."""
-        vlan = super(VLANForm, self).save(commit=False)
+        vlan = super().save(commit=False)
         if self.fabric is not None:
             vlan.fabric = self.fabric
         if "space" in self.data and not self.cleaned_data.get("space"):
diff --git a/src/maasserver/ipc.py b/src/maasserver/ipc.py
index 6f1ae13..7e59a97 100644
--- a/src/maasserver/ipc.py
+++ b/src/maasserver/ipc.py
@@ -146,7 +146,7 @@ class IPCMasterService(service.Service, object):
     connections = None
 
     def __init__(self, reactor, workers=None, socket_path=None):
-        super(IPCMasterService, self).__init__()
+        super().__init__()
         self.reactor = reactor
         self.workers = workers
         self.socket_path = socket_path
@@ -164,7 +164,7 @@ class IPCMasterService(service.Service, object):
     @asynchronous
     def startService(self):
         """Start listening on UNIX socket and create the region controller."""
-        super(IPCMasterService, self).startService()
+        super().startService()
         self.starting = self.endpoint.listen(self.factory)
 
         def save_port(port):
@@ -221,7 +221,7 @@ class IPCMasterService(service.Service, object):
 
         yield deferToDatabase(delete_all_processes)
         yield stop_update_loop()
-        yield super(IPCMasterService, self).stopService()
+        yield super().stopService()
 
     @asynchronous
     def registerWorker(self, pid, conn):
@@ -612,7 +612,7 @@ class IPCWorker(RPCProtocol):
     """The IPC client side of the protocol."""
 
     def connectionMade(self):
-        super(IPCWorker, self).connectionMade()
+        super().connectionMade()
 
         # Identify with the master process.
         d = self.callRemote(WorkerIdentify, pid=os.getpid())
@@ -635,7 +635,7 @@ class IPCWorkerService(service.Service, object):
     """
 
     def __init__(self, reactor, socket_path=None):
-        super(IPCWorkerService, self).__init__()
+        super().__init__()
         self.reactor = reactor
         self.socket_path = socket_path
         if self.socket_path is None:
@@ -648,7 +648,7 @@ class IPCWorkerService(service.Service, object):
     @asynchronous
     def startService(self):
         """Connect to UNIX socket."""
-        super(IPCWorkerService, self).startService()
+        super().startService()
         protocol = IPCWorker()
         protocol.service = self
         self.starting = connectProtocol(self.endpoint, protocol)
@@ -681,7 +681,7 @@ class IPCWorkerService(service.Service, object):
             self._protocol, protocol = None, self._protocol
             if protocol.transport:
                 protocol.transport.loseConnection()
-        return super(IPCWorkerService, self).stopService()
+        return super().stopService()
 
     @asynchronous
     def rpcPublish(self, port):
diff --git a/src/maasserver/json.py b/src/maasserver/json.py
index 671faa7..e6ba065 100644
--- a/src/maasserver/json.py
+++ b/src/maasserver/json.py
@@ -27,7 +27,7 @@ class MAASJSONEncoder(django.core.serializers.json.DjangoJSONEncoder):
         if isinstance(value, MAC):
             return value.get_raw()
         else:
-            return super(MAASJSONEncoder, self).default(value)
+            return super().default(value)
 
 
 class Serializer(django.core.serializers.json.Serializer):
diff --git a/src/maasserver/listener.py b/src/maasserver/listener.py
index 2797fc8..4bd0116 100644
--- a/src/maasserver/listener.py
+++ b/src/maasserver/listener.py
@@ -97,13 +97,13 @@ class PostgresListenerService(Service, object):
 
     def startService(self):
         """Start the listener."""
-        super(PostgresListenerService, self).startService()
+        super().startService()
         self.autoReconnect = True
         return self.tryConnection()
 
     def stopService(self):
         """Stop the listener."""
-        super(PostgresListenerService, self).stopService()
+        super().stopService()
         self.autoReconnect = False
         return self.loseConnection()
 
diff --git a/src/maasserver/macaroon_auth.py b/src/maasserver/macaroon_auth.py
index 90e8c64..069a2a0 100644
--- a/src/maasserver/macaroon_auth.py
+++ b/src/maasserver/macaroon_auth.py
@@ -301,7 +301,7 @@ class CandidClient(MacaroonClient):
         if auth_info is None:
             auth_info = get_auth_info()
         url = auth_info.agents[0].url
-        super(CandidClient, self).__init__(url, auth_info)
+        super().__init__(url, auth_info)
 
     def get_user_details(self, username: str) -> UserDetails:
         """Return details about a user."""
diff --git a/src/maasserver/management/commands/_config.py b/src/maasserver/management/commands/_config.py
index df4ce51..e4933e1 100644
--- a/src/maasserver/management/commands/_config.py
+++ b/src/maasserver/management/commands/_config.py
@@ -153,7 +153,7 @@ class GetCommand(LocalConfigCommand):
     # output.
 
     def add_arguments(self, parser):
-        super(GetCommand, self).add_arguments(parser)
+        super().add_arguments(parser)
 
         for option_name, kwargs in gen_configuration_options_for_getting():
             parser.add_argument(option_name, **kwargs)
@@ -203,7 +203,7 @@ class GetCommand(LocalConfigCommand):
 
 class ResetCommand(LocalConfigCommand):
     def add_arguments(self, parser):
-        super(ResetCommand, self).add_arguments(parser)
+        super().add_arguments(parser)
 
         for option_name, kwargs in gen_configuration_options_for_resetting():
             parser.add_argument(option_name, **kwargs)
@@ -222,7 +222,7 @@ class SetCommand(LocalConfigCommand):
     help = "Set local configuration for the MAAS region controller."
 
     def add_arguments(self, parser):
-        super(SetCommand, self).add_arguments(parser)
+        super().add_arguments(parser)
 
         for option_name, kwargs in gen_configuration_options_for_setting():
             parser.add_argument(option_name, **kwargs)
diff --git a/src/maasserver/management/commands/db_vacuum_lobjects.py b/src/maasserver/management/commands/db_vacuum_lobjects.py
index e52b6c6..86d9e1e 100644
--- a/src/maasserver/management/commands/db_vacuum_lobjects.py
+++ b/src/maasserver/management/commands/db_vacuum_lobjects.py
@@ -57,7 +57,7 @@ class Command(BaseCommand):
     )
 
     def add_arguments(self, parser):
-        super(Command, self).add_arguments(parser)
+        super().add_arguments(parser)
 
         parser.add_argument(
             "--database",
diff --git a/src/maasserver/management/commands/dbupgrade.py b/src/maasserver/management/commands/dbupgrade.py
index 8f6c438..1c8860d 100644
--- a/src/maasserver/management/commands/dbupgrade.py
+++ b/src/maasserver/management/commands/dbupgrade.py
@@ -19,7 +19,7 @@ class Command(BaseCommand):
     help = "Upgrades database schema for MAAS regiond."
 
     def add_arguments(self, parser):
-        super(Command, self).add_arguments(parser)
+        super().add_arguments(parser)
         parser.add_argument(
             "--database",
             action="store",
diff --git a/src/maasserver/management/commands/edit_named_options.py b/src/maasserver/management/commands/edit_named_options.py
index 977e81c..0c5423c 100644
--- a/src/maasserver/management/commands/edit_named_options.py
+++ b/src/maasserver/management/commands/edit_named_options.py
@@ -37,7 +37,7 @@ class Command(BaseCommand):
     )
 
     def add_arguments(self, parser):
-        super(Command, self).add_arguments(parser)
+        super().add_arguments(parser)
         add_arguments(parser)
         parser.add_argument(
             "--migrate-conflicting-options",
diff --git a/src/maasserver/management/commands/runserver.py b/src/maasserver/management/commands/runserver.py
index f41488f..a3cf0a3 100644
--- a/src/maasserver/management/commands/runserver.py
+++ b/src/maasserver/management/commands/runserver.py
@@ -18,7 +18,7 @@ class Command(BaseRunserverCommand):
     """Customized "runserver" command that wraps the WSGI handler."""
 
     def add_arguments(self, parser):
-        super(Command, self).add_arguments(parser)
+        super().add_arguments(parser)
 
         parser.add_argument(
             "--threading",
@@ -40,4 +40,4 @@ class Command(BaseRunserverCommand):
             setattr(basehttp, "WSGIServer", ThreadedWSGIServer)
 
         start_up()
-        return super(Command, self).run(*args, **options)
+        return super().run(*args, **options)
diff --git a/src/maasserver/management/commands/tests/test_dbupgrade.py b/src/maasserver/management/commands/tests/test_dbupgrade.py
index 3b58fa1..fb23b7c 100644
--- a/src/maasserver/management/commands/tests/test_dbupgrade.py
+++ b/src/maasserver/management/commands/tests/test_dbupgrade.py
@@ -66,7 +66,7 @@ class TestDBUpgrade(MAASTestCase):
 
     def setUp(self):
         """Setup a special database cluster to perform the tests."""
-        super(TestDBUpgrade, self).setUp()
+        super().setUp()
         self.datadir = self.useFixture(TempDirectory()).path
         self.cluster = self.useFixture(ClusterFixture(self.datadir))
         self.useFixture(
diff --git a/src/maasserver/models/blockdevice.py b/src/maasserver/models/blockdevice.py
index f219b44..7b642e6 100644
--- a/src/maasserver/models/blockdevice.py
+++ b/src/maasserver/models/blockdevice.py
@@ -320,7 +320,7 @@ class BlockDevice(CleanSave, TimestampedModel):
                     "Cannot delete block device because its part of "
                     "a %s." % filesystem_group.get_nice_name()
                 )
-        super(BlockDevice, self).delete()
+        super().delete()
 
     @staticmethod
     def _get_block_name_from_idx(idx, prefix="sd"):
diff --git a/src/maasserver/models/bmc.py b/src/maasserver/models/bmc.py
index 0951875..aa8981c 100644
--- a/src/maasserver/models/bmc.py
+++ b/src/maasserver/models/bmc.py
@@ -298,11 +298,11 @@ class BMC(CleanSave, TimestampedModel):
     def delete(self):
         """Delete this BMC."""
         maaslog.info("%s: Deleting BMC", self)
-        super(BMC, self).delete()
+        super().delete()
 
     def save(self, *args, **kwargs):
         """Save this BMC."""
-        super(BMC, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
         # We let name be blank for the initial save, but fix it before the
         # save completes.  This is because set_random_name() operates by
         # trying to re-save the BMC with a random hostname, and retrying until
@@ -635,7 +635,7 @@ class Pod(BMC):
     def __init__(self, *args, **kwargs):
         if "pool" not in kwargs:
             kwargs["pool"] = ResourcePool.objects.get_default_resource_pool()
-        super(Pod, self).__init__(bmc_type=BMC_TYPE.POD, *args, **kwargs)
+        super().__init__(bmc_type=BMC_TYPE.POD, *args, **kwargs)
 
     def clean(self):
         super().clean()
diff --git a/src/maasserver/models/bootresource.py b/src/maasserver/models/bootresource.py
index 6dcc65e..592861d 100644
--- a/src/maasserver/models/bootresource.py
+++ b/src/maasserver/models/bootresource.py
@@ -530,9 +530,7 @@ class BootResource(CleanSave, TimestampedModel):
     def unique_error_message(self, model_class, unique_check):
         if unique_check == ("name", "architecture"):
             return "Boot resource of name, and architecture already " "exists."
-        return super(BootResource, self).unique_error_message(
-            model_class, unique_check
-        )
+        return super().unique_error_message(model_class, unique_check)
 
     def get_latest_set(self):
         """Return latest `BootResourceSet`."""
diff --git a/src/maasserver/models/bootsource.py b/src/maasserver/models/bootsource.py
index 1a2717c..358b98b 100644
--- a/src/maasserver/models/bootsource.py
+++ b/src/maasserver/models/bootsource.py
@@ -37,7 +37,7 @@ class BootSource(CleanSave, TimestampedModel):
     )
 
     def clean(self, *args, **kwargs):
-        super(BootSource, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
 
         # You have to specify one of {keyring_data, keyring_filename}.
         if len(self.keyring_filename) == 0 and len(self.keyring_data) == 0:
diff --git a/src/maasserver/models/cleansave.py b/src/maasserver/models/cleansave.py
index ab7a4c3..1f92a2f 100644
--- a/src/maasserver/models/cleansave.py
+++ b/src/maasserver/models/cleansave.py
@@ -18,7 +18,7 @@ class CleanSaveModelState(ModelState):
     """Provides helpers on `_state` attribute on a model."""
 
     def __init__(self, db=None):
-        super(CleanSaveModelState, self).__init__(db=db)
+        super().__init__(db=db)
         self._changed_fields = {}
 
     def get_changed(self):
@@ -64,7 +64,7 @@ class CleanSave:
 
     @classmethod
     def from_db(cls, db, field_names, values):
-        new = super(CleanSave, cls).from_db(db, field_names, values)
+        new = super().from_db(db, field_names, values)
         new._state._changed_fields = {}
         return new
 
@@ -104,9 +104,9 @@ class CleanSave:
             # if a field has changed.
             value.__class__ = CleanSaveModelState
             value._changed_fields = {}
-            return super(CleanSave, self).__setattr__(name, value)
+            return super().__setattr__(name, value)
         if not hasattr(self, "_state"):
-            return super(CleanSave, self).__setattr__(name, value)
+            return super().__setattr__(name, value)
 
         try:
             field = self._meta.get_field(name)
@@ -117,7 +117,7 @@ class CleanSave:
                     raise AttributeError("can't set attribute")
                 prop_obj.fset(self, value)
             else:
-                super(CleanSave, self).__setattr__(name, value)
+                super().__setattr__(name, value)
         else:
 
             def _wrap_setattr():
@@ -149,13 +149,13 @@ class CleanSave:
                     # Field that holds the actual referenced objects. Ignore
                     # tracking because the related descriptor will set the
                     # related primary key for the field.
-                    super(CleanSave, self).__setattr__(name, value)
+                    super().__setattr__(name, value)
                 else:
                     raise AttributeError(
                         "Unknown field(%s) for: %s" % (name, field)
                     )
             else:
-                super(CleanSave, self).__setattr__(name, value)
+                super().__setattr__(name, value)
 
     def save(self, *args, **kwargs):
         """Perform `full_clean` before save and only save changed fields."""
@@ -185,7 +185,7 @@ class CleanSave:
                 exclude=exclude_clean_fields, validate_unique=False
             )
             self.validate_unique(exclude=[self._meta.pk.name])
-            return super(CleanSave, self).save(*args, **kwargs)
+            return super().save(*args, **kwargs)
         elif self._state._changed_fields:
             # This is the new path where saving only updates the fields
             # that have actually changed.
@@ -223,7 +223,7 @@ class CleanSave:
                 for key, value in self._state._changed_fields.items()
                 if value is not FieldUnset
             }
-            return super(CleanSave, self).save(*args, **kwargs)
+            return super().save(*args, **kwargs)
         else:
             # Nothing changed so nothing needs to be saved.
             return self
@@ -254,7 +254,7 @@ class CleanSave:
                 }
             )
             update_fields = frozenset(update_fields)
-        res = super(CleanSave, self)._save_table(
+        res = super()._save_table(
             raw=raw,
             cls=cls,
             force_insert=force_insert,
diff --git a/src/maasserver/models/config.py b/src/maasserver/models/config.py
index b83e34d..2aa381d 100644
--- a/src/maasserver/models/config.py
+++ b/src/maasserver/models/config.py
@@ -147,7 +147,7 @@ class ConfigManager(Manager):
     """
 
     def __init__(self):
-        super(ConfigManager, self).__init__()
+        super().__init__()
         self._config_changed_connections = defaultdict(set)
 
     def get_config(self, name, default=None):
diff --git a/src/maasserver/models/dhcpsnippet.py b/src/maasserver/models/dhcpsnippet.py
index a904637..417a640 100644
--- a/src/maasserver/models/dhcpsnippet.py
+++ b/src/maasserver/models/dhcpsnippet.py
@@ -32,7 +32,7 @@ class DHCPSnippetQueriesMixin(MAASQueriesMixin):
             "id": "__id",
             "name": "__name",
         }
-        return super(DHCPSnippetQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/discovery.py b/src/maasserver/models/discovery.py
index f8a5b2a..91c59aa 100644
--- a/src/maasserver/models/discovery.py
+++ b/src/maasserver/models/discovery.py
@@ -42,7 +42,7 @@ class DiscoveryQueriesMixin(MAASQueriesMixin):
             "ip": "__ip",
             "mac": "__mac_address",
         }
-        return super(DiscoveryQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/dnsresource.py b/src/maasserver/models/dnsresource.py
index 835d68b..fef9712 100644
--- a/src/maasserver/models/dnsresource.py
+++ b/src/maasserver/models/dnsresource.py
@@ -112,7 +112,7 @@ class DNSResourceQueriesMixin(MAASQueriesMixin):
             "name": "__name",
             "domain": (Domain.objects, "domain"),
         }
-        return super(DNSResourceQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
@@ -340,7 +340,7 @@ class DNSResource(CleanSave, TimestampedModel):
             ).count()
             if num_cname > 0:
                 raise ValidationError("Cannot add address: CNAME present.")
-        super(DNSResource, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
 
     def render_json(self, system_id):
         """Render json.  System_id is the system_id for the node, if one
diff --git a/src/maasserver/models/domain.py b/src/maasserver/models/domain.py
index b1082a1..a131a5b 100644
--- a/src/maasserver/models/domain.py
+++ b/src/maasserver/models/domain.py
@@ -68,7 +68,7 @@ class DomainQueriesMixin(MAASQueriesMixin):
             "name": "__name",
             "id": "__id",
         }
-        return super(DomainQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
@@ -344,11 +344,11 @@ class Domain(CleanSave, TimestampedModel):
             raise ValidationError(
                 "This domain is the default domain, it cannot be deleted."
             )
-        super(Domain, self).delete()
+        super().delete()
 
     def save(self, *args, **kwargs):
         created = self.id is None
-        super(Domain, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
         if created:
             self.update_kms_srv()
         # If there is a DNSResource in our parent domain that matches this
@@ -367,7 +367,7 @@ class Domain(CleanSave, TimestampedModel):
             self.name = self.name[:-1]
 
     def clean(self, *args, **kwargs):
-        super(Domain, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         self.clean_name()
 
     def render_json_for_related_rrdata(
diff --git a/src/maasserver/models/fabric.py b/src/maasserver/models/fabric.py
index 9e2b212..87dafab 100644
--- a/src/maasserver/models/fabric.py
+++ b/src/maasserver/models/fabric.py
@@ -45,7 +45,7 @@ class FabricQueriesMixin(MAASQueriesMixin):
             "name": "__name",
             "class": "__class_type",
         }
-        return super(FabricQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
@@ -208,7 +208,7 @@ class Fabric(CleanSave, TimestampedModel):
                 "Can't delete fabric; the following interfaces are "
                 "still connected: %s" % (", ".join(descriptions))
             )
-        super(Fabric, self).delete()
+        super().delete()
 
     def _create_default_vlan(self):
         # Circular imports.
@@ -222,7 +222,7 @@ class Fabric(CleanSave, TimestampedModel):
         # Name will get set by clean_name() if None or empty, and there is an
         # id. We just need to handle names here for creation.
         created = self.id is None
-        super(Fabric, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
         if self.name is None or self.name == "":
             # If we got here, then we have a newly created fabric that needs a
             # default name.
diff --git a/src/maasserver/models/fannetwork.py b/src/maasserver/models/fannetwork.py
index be6941a..3227676 100644
--- a/src/maasserver/models/fannetwork.py
+++ b/src/maasserver/models/fannetwork.py
@@ -160,6 +160,6 @@ class FanNetwork(CleanSave, TimestampedModel):
             )
 
     def clean(self, *args, **kwargs):
-        super(FanNetwork, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         self.clean_overlay()
         self.clean_host_reserve()
diff --git a/src/maasserver/models/filesystem.py b/src/maasserver/models/filesystem.py
index e868197..86feef5 100644
--- a/src/maasserver/models/filesystem.py
+++ b/src/maasserver/models/filesystem.py
@@ -248,7 +248,7 @@ class Filesystem(CleanSave, TimestampedModel):
         return self.fstype in self.TYPES_REQUIRING_STORAGE
 
     def clean(self, *args, **kwargs):
-        super(Filesystem, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         parents = self.partition, self.block_device, self.node
 
         # You have to specify either a partition, block device, or node.
@@ -337,4 +337,4 @@ class Filesystem(CleanSave, TimestampedModel):
     def save(self, *args, **kwargs):
         if not self.uuid:
             self.uuid = uuid4()
-        super(Filesystem, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
diff --git a/src/maasserver/models/filesystemgroup.py b/src/maasserver/models/filesystemgroup.py
index c3b9bb3..c8afb6e 100644
--- a/src/maasserver/models/filesystemgroup.py
+++ b/src/maasserver/models/filesystemgroup.py
@@ -42,11 +42,7 @@ class BaseFilesystemGroupManager(Manager):
     extra_filters = {}
 
     def get_queryset(self):
-        return (
-            super(BaseFilesystemGroupManager, self)
-            .get_queryset()
-            .filter(**self.extra_filters)
-        )
+        return super().get_queryset().filter(**self.extra_filters)
 
     def get_object_or_404(self, system_id, filesystem_group_id, user, perm):
         """Fetch a `FilesystemGroup` by its `Node`'s system_id and its id.
@@ -559,7 +555,7 @@ class FilesystemGroup(CleanSave, TimestampedModel):
         )
 
     def clean(self, *args, **kwargs):
-        super(FilesystemGroup, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
 
         # We allow the initial save to skip model validation, any
         # additional saves required filesystems linked. This is because the
@@ -751,7 +747,7 @@ class FilesystemGroup(CleanSave, TimestampedModel):
             self.name = FilesystemGroup.objects.get_available_name_for(self)
         if not self.uuid:
             self.uuid = uuid4()
-        super(FilesystemGroup, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
         # Update or create the virtual block device when the filesystem group
         # is saved. Does nothing if group_type is LVM_VG. Virtual block device
@@ -791,7 +787,7 @@ class FilesystemGroup(CleanSave, TimestampedModel):
         # Possible that the virtual block device has already deleted the
         # filesystem group. Skip the call if no id is set.
         if self.id is not None:
-            super(FilesystemGroup, self).delete()
+            super().delete()
 
     def get_nice_name(self):
         """Return the nice name for the filesystem group.
@@ -856,7 +852,7 @@ class VolumeGroup(FilesystemGroup):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(VolumeGroup, self).__init__(
+        super().__init__(
             group_type=FILESYSTEM_GROUP_TYPE.LVM_VG, *args, **kwargs
         )
 
@@ -934,7 +930,7 @@ class RAID(FilesystemGroup):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(RAID, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if self.group_type not in FILESYSTEM_GROUP_RAID_TYPES:
             raise ValueError("group_type must be a valid RAID type.")
 
@@ -1039,7 +1035,7 @@ class Bcache(FilesystemGroup):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(Bcache, self).__init__(
+        super().__init__(
             group_type=FILESYSTEM_GROUP_TYPE.BCACHE, *args, **kwargs
         )
 
diff --git a/src/maasserver/models/interface.py b/src/maasserver/models/interface.py
index 14a2b62..471ad4d 100644
--- a/src/maasserver/models/interface.py
+++ b/src/maasserver/models/interface.py
@@ -107,7 +107,7 @@ class InterfaceQueriesMixin(MAASQueriesMixin):
             "tag": self._add_tag_query,
             "link_speed": "__link_speed__gte",
         }
-        return super(InterfaceQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
@@ -202,7 +202,7 @@ class InterfaceQueriesMixin(MAASQueriesMixin):
         :returns: tuple (set, dict)
 
         """
-        return super(InterfaceQueriesMixin, self).get_matching_object_map(
+        return super().get_matching_object_map(
             specifiers, "node__id", include_filter=include_filter
         )
 
@@ -428,9 +428,7 @@ class InterfaceManager(Manager, InterfaceQueriesMixin):
                 if matches(rel.child):
                     return rel.child, False
 
-        interface, created = super(InterfaceManager, self).get_or_create(
-            *args, **kwargs
-        )
+        interface, created = super().get_or_create(*args, **kwargs)
 
         if created:
             for parent in parents:
@@ -627,7 +625,7 @@ class Interface(CleanSave, TimestampedModel):
         type = kwargs.get("type", self.get_type())
         kwargs["type"] = type
         # Derive the concrete class from the interface's type.
-        super(Interface, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         klass = INTERFACE_TYPE_MAPPING.get(self.type)
         if klass:
             self.__class__ = klass
@@ -1462,7 +1460,7 @@ class Interface(CleanSave, TimestampedModel):
         return all_related
 
     def clean(self):
-        super(Interface, self).clean()
+        super().clean()
 
         # Verify that the MAC address is legal if it is not empty.
         if self.mac_address:
@@ -1483,7 +1481,7 @@ class Interface(CleanSave, TimestampedModel):
         # lease then.
         if not remove_ip_address:
             self._skip_ip_address_removal = True
-        super(Interface, self).delete()
+        super().delete()
 
     def add_tag(self, tag):
         """Add tag to interface."""
@@ -1658,7 +1656,7 @@ class PhysicalInterface(Interface):
         return INTERFACE_TYPE.PHYSICAL
 
     def clean(self):
-        super(PhysicalInterface, self).clean()
+        super().clean()
         # Node and MAC address is always required for a physical interface.
         validation_errors = {}
         if self.node is None:
@@ -1845,7 +1843,7 @@ class BondInterface(ChildInterface):
         return INTERFACE_TYPE.BOND
 
     def clean(self):
-        super(BondInterface, self).clean()
+        super().clean()
         # Validate that the MAC address is not None.
         if not self.mac_address:
             raise ValidationError(
@@ -1867,7 +1865,7 @@ class BondInterface(ChildInterface):
         self.node = self.get_node()
         # Set the enabled status based on its parents.
         self.enabled = self.is_enabled()
-        super(BondInterface, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
 
 def build_vlan_interface_name(parent, vlan):
@@ -1933,7 +1931,7 @@ class VLANInterface(ChildInterface):
         return "vlan%s" % vid
 
     def clean(self):
-        super(VLANInterface, self).clean()
+        super().clean()
         if self.id is not None:
             # Use the precache here instead of the count() method.
             parents = self.parents.all()
@@ -2002,7 +2000,7 @@ class VLANInterface(ChildInterface):
             new_name = self.get_name()
             if self.name != new_name:
                 self.name = new_name
-        return super(VLANInterface, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)
 
 
 class UnknownInterface(Interface):
@@ -2019,7 +2017,7 @@ class UnknownInterface(Interface):
         return None
 
     def clean(self):
-        super(UnknownInterface, self).clean()
+        super().clean()
         if self.node is not None:
             raise ValidationError({"node": ["This field must be blank."]})
 
diff --git a/src/maasserver/models/iprange.py b/src/maasserver/models/iprange.py
index 2f4ec90..e8d1777 100644
--- a/src/maasserver/models/iprange.py
+++ b/src/maasserver/models/iprange.py
@@ -45,7 +45,7 @@ class IPRangeQueriesMixin(MAASQueriesMixin):
             "start_ip": "__start_ip",
             "end_ip": "__end_ip",
         }
-        return super(IPRangeQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/iscsiblockdevice.py b/src/maasserver/models/iscsiblockdevice.py
index 8aaf6e9..ccb01a6 100644
--- a/src/maasserver/models/iscsiblockdevice.py
+++ b/src/maasserver/models/iscsiblockdevice.py
@@ -66,4 +66,4 @@ class ISCSIBlockDevice(BlockDevice):
     def save(self, *args, **kwargs):
         # Normilize the target to always include a 'iscsi:' at the start.
         self.target = get_iscsi_target(self.target)
-        return super(ISCSIBlockDevice, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)
diff --git a/src/maasserver/models/largefile.py b/src/maasserver/models/largefile.py
index 5d0a24d..90b2c78 100644
--- a/src/maasserver/models/largefile.py
+++ b/src/maasserver/models/largefile.py
@@ -146,7 +146,7 @@ class LargeFile(CleanSave, TimestampedModel):
         for link in links:
             if getattr(self, link).exists():
                 return
-        super(LargeFile, self).delete(*args, **kwargs)
+        super().delete(*args, **kwargs)
 
 
 @asynchronous(timeout=FOREVER)
diff --git a/src/maasserver/models/licensekey.py b/src/maasserver/models/licensekey.py
index 54559bf..83da5ef 100644
--- a/src/maasserver/models/licensekey.py
+++ b/src/maasserver/models/licensekey.py
@@ -76,6 +76,4 @@ class LicenseKey(TimestampedModel):
                 "License key with this operating system and distro series",
                 "already exists.",
             )
-        return super(LicenseKey, self).unique_error_message(
-            model_class, unique_check
-        )
+        return super().unique_error_message(model_class, unique_check)
diff --git a/src/maasserver/models/neighbour.py b/src/maasserver/models/neighbour.py
index fef3e18..3065c3e 100644
--- a/src/maasserver/models/neighbour.py
+++ b/src/maasserver/models/neighbour.py
@@ -30,7 +30,7 @@ class NeighbourQueriesMixin(MAASQueriesMixin):
             "ip": "__ip",
             "mac": "__mac_address",
         }
-        return super(NeighbourQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 7e867cd..c226dae 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -1898,7 +1898,7 @@ class Node(CleanSave, TimestampedModel):
             )
 
     def clean(self, *args, **kwargs):
-        super(Node, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         self.prev_bmc_id = self._state.get_old_value("bmc_id")
         if self._state.has_changed("hostname"):
             self.clean_hostname_domain()
@@ -1951,7 +1951,7 @@ class Node(CleanSave, TimestampedModel):
             ):
                 kwargs["update_fields"].append("status_expires")
 
-        super(Node, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
         # We let hostname be blank for the initial save, but fix it before the
         # save completes.  This is because set_random_hostname() operates by
@@ -2949,7 +2949,7 @@ class Node(CleanSave, TimestampedModel):
                 )
                 self.bmc.delete()
 
-            super(Node, self).delete(*args, **kwargs)
+            super().delete(*args, **kwargs)
 
     def set_random_hostname(self):
         """Set a random `hostname`."""
@@ -6082,9 +6082,7 @@ class Machine(Node):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(Machine, self).__init__(
-            node_type=NODE_TYPE.MACHINE, *args, **kwargs
-        )
+        super().__init__(node_type=NODE_TYPE.MACHINE, *args, **kwargs)
 
     def delete(self, force=False):
         """Deletes this Machine.
@@ -6107,7 +6105,7 @@ class Controller(Node):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(Controller, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def _was_probably_machine(self):
         """Best guess if a rack was a machine.
@@ -6941,9 +6939,7 @@ class RackController(Controller):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(RackController, self).__init__(
-            node_type=NODE_TYPE.RACK_CONTROLLER, *args, **kwargs
-        )
+        super().__init__(node_type=NODE_TYPE.RACK_CONTROLLER, *args, **kwargs)
 
     @inlineCallbacks
     def refresh(self):
@@ -7307,7 +7303,7 @@ class RegionController(Controller):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(RegionController, self).__init__(
+        super().__init__(
             node_type=NODE_TYPE.REGION_CONTROLLER, *args, **kwargs
         )
 
@@ -7378,9 +7374,7 @@ class Device(Node):
         proxy = True
 
     def __init__(self, *args, **kwargs):
-        super(Device, self).__init__(
-            node_type=NODE_TYPE.DEVICE, *args, **kwargs
-        )
+        super().__init__(node_type=NODE_TYPE.DEVICE, *args, **kwargs)
 
 
 class NodeGroupToRackController(CleanSave, Model):
diff --git a/src/maasserver/models/nodemetadata.py b/src/maasserver/models/nodemetadata.py
index 7b13926..fdc3ccd 100644
--- a/src/maasserver/models/nodemetadata.py
+++ b/src/maasserver/models/nodemetadata.py
@@ -64,4 +64,4 @@ class NodeMetadata(CleanSave, TimestampedModel):
     def delete(self):
         """Delete this node metadata entry."""
         maaslog.info("%s: deleting key '%s'.", self, self.key)
-        super(NodeMetadata, self).delete()
+        super().delete()
diff --git a/src/maasserver/models/notification.py b/src/maasserver/models/notification.py
index dba7383..ad862ba 100644
--- a/src/maasserver/models/notification.py
+++ b/src/maasserver/models/notification.py
@@ -236,7 +236,7 @@ class Notification(CleanSave, TimestampedModel):
         )
 
     def clean(self):
-        super(Notification, self).clean()
+        super().clean()
         # Elementary cleaning that Django can't seem to do for us, mainly
         # because setting blank=False causes any number of problems.
         if self.ident == "":
diff --git a/src/maasserver/models/packagerepository.py b/src/maasserver/models/packagerepository.py
index 446e231..4c45787 100644
--- a/src/maasserver/models/packagerepository.py
+++ b/src/maasserver/models/packagerepository.py
@@ -32,7 +32,7 @@ class PackageRepositoryQueriesMixin(MAASQueriesMixin):
             "id": "__id",
             "name": "__name",
         }
-        return super(PackageRepositoryQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/partition.py b/src/maasserver/models/partition.py
index 021b471..109c7bb 100644
--- a/src/maasserver/models/partition.py
+++ b/src/maasserver/models/partition.py
@@ -261,12 +261,12 @@ class Partition(CleanSave, TimestampedModel):
         """Save partition."""
         if not self.uuid:
             self.uuid = uuid4()
-        return super(Partition, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)
 
     def clean(self, *args, **kwargs):
         self._round_size()
         self._validate_enough_space()
-        super(Partition, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
 
     def __str__(self):
         return "{size} partition on {bd}".format(
@@ -379,7 +379,7 @@ class Partition(CleanSave, TimestampedModel):
                 "VMware ESXi partitions may not be removed. To remove select "
                 "a different storage layout."
             )
-        super(Partition, self).delete()
+        super().delete()
 
     def add_tag(self, tag):
         """Add tag to partition."""
diff --git a/src/maasserver/models/partitiontable.py b/src/maasserver/models/partitiontable.py
index b238c4b..5c65ee6 100644
--- a/src/maasserver/models/partitiontable.py
+++ b/src/maasserver/models/partitiontable.py
@@ -145,7 +145,7 @@ class PartitionTable(CleanSave, TimestampedModel):
         return "Partition table for {bd}".format(bd=self.block_device)
 
     def clean(self, *args, **kwargs):
-        super(PartitionTable, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         # Circular imports.
         from maasserver.models.virtualblockdevice import VirtualBlockDevice
 
diff --git a/src/maasserver/models/physicalblockdevice.py b/src/maasserver/models/physicalblockdevice.py
index e9d28f9..4a1a841 100644
--- a/src/maasserver/models/physicalblockdevice.py
+++ b/src/maasserver/models/physicalblockdevice.py
@@ -91,7 +91,7 @@ class PhysicalBlockDevice(BlockDevice):
             raise ValidationError(
                 "serial/model are required if id_path is not provided."
             )
-        super(PhysicalBlockDevice, self).clean()
+        super().clean()
 
     def __str__(self):
         return "{model} S/N {serial} {size} attached to {node}".format(
diff --git a/src/maasserver/models/resourcepool.py b/src/maasserver/models/resourcepool.py
index 0bc1673..f910a86 100644
--- a/src/maasserver/models/resourcepool.py
+++ b/src/maasserver/models/resourcepool.py
@@ -31,7 +31,7 @@ class ResourcePoolQueriesMixin(MAASQueriesMixin):
             "name": "__name",
             "id": "__id",
         }
-        return super(ResourcePoolQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/signals/testing.py b/src/maasserver/models/signals/testing.py
index 0dfaea3..898cdeb 100644
--- a/src/maasserver/models/signals/testing.py
+++ b/src/maasserver/models/signals/testing.py
@@ -29,7 +29,7 @@ class SignalsDisabled(Fixture):
             are specified, ALL managers will be disabled. If the manager is
             already disabled it will not be enabled at clean-up.
         """
-        super(SignalsDisabled, self).__init__()
+        super().__init__()
         if len(disable) == 0:
             self.disable = self.managers.values()
         else:
@@ -38,7 +38,7 @@ class SignalsDisabled(Fixture):
             }
 
     def setUp(self):
-        super(SignalsDisabled, self).setUp()
+        super().setUp()
         for manager in self.disable:
             if manager.enabled:
                 self.addCleanup(manager.enable)
diff --git a/src/maasserver/models/signals/tests/test_events.py b/src/maasserver/models/signals/tests/test_events.py
index b3a63c2..7e8466e 100644
--- a/src/maasserver/models/signals/tests/test_events.py
+++ b/src/maasserver/models/signals/tests/test_events.py
@@ -17,7 +17,7 @@ from provisioningserver.events import EVENT_DETAILS, EVENT_TYPES
 
 class TestStatusTransitionEvent(MAASServerTestCase):
     def setUp(self):
-        super(TestStatusTransitionEvent, self).setUp()
+        super().setUp()
         # Circular imports.
         from maasserver.models import signals
 
diff --git a/src/maasserver/models/signals/tests/test_nodes.py b/src/maasserver/models/signals/tests/test_nodes.py
index 1eb382a..5521afc 100644
--- a/src/maasserver/models/signals/tests/test_nodes.py
+++ b/src/maasserver/models/signals/tests/test_nodes.py
@@ -52,7 +52,7 @@ class TestNodePreviousStatus(MAASServerTestCase):
     """Test that `previous_status` is set when the status is changed."""
 
     def setUp(self):
-        super(TestNodePreviousStatus, self).setUp()
+        super().setUp()
         # Disable power signals: some status transitions prompt a power check.
         self.addCleanup(power.signals.enable)
         power.signals.disable()
@@ -97,7 +97,7 @@ class TestNodeClearsOwnerNEWOrREADYStatus(MAASServerTestCase):
     """
 
     def setUp(self):
-        super(TestNodeClearsOwnerNEWOrREADYStatus, self).setUp()
+        super().setUp()
         # Disable power signals: some status transitions prompt a power check.
         self.addCleanup(power.signals.enable)
         power.signals.disable()
diff --git a/src/maasserver/models/space.py b/src/maasserver/models/space.py
index 416affb..dee76eb 100644
--- a/src/maasserver/models/space.py
+++ b/src/maasserver/models/space.py
@@ -44,7 +44,7 @@ class SpaceQueriesMixin(MAASQueriesMixin):
             "name": "__name",
             "subnet": (Subnet.objects, "vlan__space"),
         }
-        return super(SpaceQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
@@ -170,7 +170,7 @@ class Space(CleanSave, TimestampedModel):
             self.save()
 
     def clean(self, *args, **kwargs):
-        super(Space, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         self.clean_name()
 
     @property
diff --git a/src/maasserver/models/sslkey.py b/src/maasserver/models/sslkey.py
index 92fe957..384a4d8 100644
--- a/src/maasserver/models/sslkey.py
+++ b/src/maasserver/models/sslkey.py
@@ -91,9 +91,7 @@ class SSLKey(CleanSave, TimestampedModel):
     def unique_error_message(self, model_class, unique_check):
         if unique_check == ("user", "key"):
             return "This key has already been added for this user."
-        return super(SSLKey, self).unique_error_message(
-            model_class, unique_check
-        )
+        return super().unique_error_message(model_class, unique_check)
 
     def __str__(self):
         return self.key
diff --git a/src/maasserver/models/staticipaddress.py b/src/maasserver/models/staticipaddress.py
index a2bbc6c..36512c8 100644
--- a/src/maasserver/models/staticipaddress.py
+++ b/src/maasserver/models/staticipaddress.py
@@ -993,7 +993,7 @@ class StaticIPAddress(CleanSave, TimestampedModel):
         )
 
     def clean(self, *args, **kwargs):
-        super(StaticIPAddress, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
         self.clean_subnet_and_ip_consistent()
 
     def validate_unique(self, exclude=None):
diff --git a/src/maasserver/models/subnet.py b/src/maasserver/models/subnet.py
index d4d0798..ac10f0f 100644
--- a/src/maasserver/models/subnet.py
+++ b/src/maasserver/models/subnet.py
@@ -197,7 +197,7 @@ class SubnetQueriesMixin(MAASQueriesMixin):
             "vid": self._add_vlan_vid_query,
             "vlan": (VLAN.objects, "subnet"),
         }
-        return super(SubnetQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
diff --git a/src/maasserver/models/switch.py b/src/maasserver/models/switch.py
index 73a1684..b415886 100644
--- a/src/maasserver/models/switch.py
+++ b/src/maasserver/models/switch.py
@@ -55,4 +55,4 @@ class Switch(CleanSave, TimestampedModel):
     def delete(self):
         """Delete this switch."""
         maaslog.info("%s: Deleting switch", self)
-        super(Switch, self).delete()
+        super().delete()
diff --git a/src/maasserver/models/tag.py b/src/maasserver/models/tag.py
index d01d263..9dc5449 100644
--- a/src/maasserver/models/tag.py
+++ b/src/maasserver/models/tag.py
@@ -77,7 +77,7 @@ class Tag(CleanSave, TimestampedModel):
     objects = TagManager()
 
     def __init__(self, *args, **kwargs):
-        super(Tag, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # Track what the original definition is, so we can detect when it
         # changes and we need to repopulate the node<=>tag mapping.
         # We have to check for self.id, otherwise we don't see the creation of
@@ -145,7 +145,7 @@ class Tag(CleanSave, TimestampedModel):
         :param populate: Whether or not to call `populate_nodes` if the
             definition has changed.
         """
-        super(Tag, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
         if populate and (self.definition != self._original_definition):
             self.populate_nodes()
         self._original_definition = self.definition
diff --git a/src/maasserver/models/testing.py b/src/maasserver/models/testing.py
index 24daf49..9e24e2d 100644
--- a/src/maasserver/models/testing.py
+++ b/src/maasserver/models/testing.py
@@ -17,7 +17,7 @@ class SignalDisconnected(fixtures.Fixture):  # DEPRECATED
     def __init__(
         self, signal, receiver, sender=None, weak=True, dispatch_uid=None
     ):
-        super(SignalDisconnected, self).__init__()
+        super().__init__()
         self.signal = signal
         self.receiver = receiver
         self.sender = sender
@@ -25,7 +25,7 @@ class SignalDisconnected(fixtures.Fixture):  # DEPRECATED
         self.dispatch_uid = dispatch_uid
 
     def setUp(self):
-        super(SignalDisconnected, self).setUp()
+        super().setUp()
         self.addCleanup(
             self.signal.connect,
             receiver=self.receiver,
@@ -49,11 +49,11 @@ class SignalsDisconnected(fixtures.Fixture):  # DEPRECATED
     """
 
     def __init__(self, *signals):
-        super(SignalsDisconnected, self).__init__()
+        super().__init__()
         self.signals = signals
 
     def setUp(self):
-        super(SignalsDisconnected, self).setUp()
+        super().setUp()
 
         def restore(signal, receivers):
             with signal.lock:
diff --git a/src/maasserver/models/tests/test_bootresource.py b/src/maasserver/models/tests/test_bootresource.py
index c7f747d..825bbec 100644
--- a/src/maasserver/models/tests/test_bootresource.py
+++ b/src/maasserver/models/tests/test_bootresource.py
@@ -348,7 +348,7 @@ class TestBootResourceManager(MAASServerTestCase):
 
 class TestGetAvailableCommissioningResources(MAASServerTestCase):
     def setUp(self):
-        super(TestGetAvailableCommissioningResources, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/models/tests/test_bootsource.py b/src/maasserver/models/tests/test_bootsource.py
index 9b82fd8..12425cd 100644
--- a/src/maasserver/models/tests/test_bootsource.py
+++ b/src/maasserver/models/tests/test_bootsource.py
@@ -24,7 +24,7 @@ class TestBootSource(MAASServerTestCase):
     """Tests for the `BootSource` model."""
 
     def setUp(self):
-        super(TestBootSource, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/models/tests/test_bootsourcecache.py b/src/maasserver/models/tests/test_bootsourcecache.py
index dd61bd9..9e2143a 100644
--- a/src/maasserver/models/tests/test_bootsourcecache.py
+++ b/src/maasserver/models/tests/test_bootsourcecache.py
@@ -13,7 +13,7 @@ from maasserver.testing.testcase import MAASServerTestCase
 
 class TestBootSourceCache(MAASServerTestCase):
     def setUp(self):
-        super(TestBootSourceCache, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/models/tests/test_bootsourceselection.py b/src/maasserver/models/tests/test_bootsourceselection.py
index d5df0c1..7e2995b 100644
--- a/src/maasserver/models/tests/test_bootsourceselection.py
+++ b/src/maasserver/models/tests/test_bootsourceselection.py
@@ -17,7 +17,7 @@ class TestBootSourceSelection(MAASServerTestCase):
     """Tests for the `BootSourceSelection` model."""
 
     def setUp(self):
-        super(TestBootSourceSelection, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/models/tests/test_config.py b/src/maasserver/models/tests/test_config.py
index 11ad067..e33a14e 100644
--- a/src/maasserver/models/tests/test_config.py
+++ b/src/maasserver/models/tests/test_config.py
@@ -236,7 +236,7 @@ class SettingConfigTest(MAASServerTestCase):
     scenarios = tuple((name, {"name": name}) for name in get_default_config())
 
     def setUp(self):
-        super(SettingConfigTest, self).setUp()
+        super().setUp()
         # Some of these setting we have to be careful about.
         if self.name in {"enable_http_proxy", "http_proxy"}:
             manager = signals.bootsources.signals
diff --git a/src/maasserver/models/tests/test_dnspublication.py b/src/maasserver/models/tests/test_dnspublication.py
index 3930196..62d5975 100644
--- a/src/maasserver/models/tests/test_dnspublication.py
+++ b/src/maasserver/models/tests/test_dnspublication.py
@@ -92,7 +92,7 @@ class TestDNSPublicationManager(MAASServerTestCase):
     """Test `DNSPublicationManager`."""
 
     def setUp(self):
-        super(TestDNSPublicationManager, self).setUp()
+        super().setUp()
         # These tests expect the DNSPublication table to be empty.
         DNSPublication.objects.all().delete()
 
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 3b9a6fb..642c5c6 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -978,7 +978,7 @@ class TestDeviceManager(MAASServerTestCase):
 
 class TestNode(MAASServerTestCase):
     def setUp(self):
-        super(TestNode, self).setUp()
+        super().setUp()
         self.patch_autospec(node_module, "power_driver_check")
 
     def disable_node_query(self):
@@ -5612,7 +5612,7 @@ class TestNode(MAASServerTestCase):
 
 class TestNodePowerParameters(MAASServerTestCase):
     def setUp(self):
-        super(TestNodePowerParameters, self).setUp()
+        super().setUp()
         self.patch_autospec(node_module, "power_driver_check")
 
     def test_power_parameters_are_stored(self):
@@ -8137,7 +8137,7 @@ class TestNode_Start(MAASTransactionServerTestCase):
     """Tests for Node.start()."""
 
     def setUp(self):
-        super(TestNode_Start, self).setUp()
+        super().setUp()
         self.patch_autospec(node_module, "power_driver_check")
 
     def make_acquired_node_with_interface(
@@ -9051,7 +9051,7 @@ class TestNode_Stop(MAASServerTestCase):
     """Tests for Node.stop()."""
 
     def setUp(self):
-        super(TestNode_Stop, self).setUp()
+        super().setUp()
         self.patch_autospec(node_module, "power_driver_check")
 
     def make_acquired_node_with_interface(
diff --git a/src/maasserver/models/tests/test_rbacsync.py b/src/maasserver/models/tests/test_rbacsync.py
index fc4df87..8835a7c 100644
--- a/src/maasserver/models/tests/test_rbacsync.py
+++ b/src/maasserver/models/tests/test_rbacsync.py
@@ -15,7 +15,7 @@ class TestRBACSync(MAASServerTestCase):
     """Test `RBACSync`."""
 
     def setUp(self):
-        super(TestRBACSync, self).setUp()
+        super().setUp()
         # These tests expect the RBACSync table to be empty.
         RBACSync.objects.all().delete()
 
diff --git a/src/maasserver/models/timestampedmodel.py b/src/maasserver/models/timestampedmodel.py
index b13ec00..80b96a7 100644
--- a/src/maasserver/models/timestampedmodel.py
+++ b/src/maasserver/models/timestampedmodel.py
@@ -82,4 +82,4 @@ class TimestampedModel(Model, object):
                 kwargs["update_fields"].add("created")
             if update_updated:
                 kwargs["update_fields"].add("updated")
-        return super(TimestampedModel, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)
diff --git a/src/maasserver/models/userprofile.py b/src/maasserver/models/userprofile.py
index 75e2b6f..68c7c00 100644
--- a/src/maasserver/models/userprofile.py
+++ b/src/maasserver/models/userprofile.py
@@ -93,7 +93,7 @@ class UserProfile(CleanSave, Model):
             self.user.filestorage_set.all().delete()
         self.user.consumers.all().delete()
         self.user.delete()
-        super(UserProfile, self).delete()
+        super().delete()
 
     def transfer_resources(self, new_owner):
         """Transfer owned resources to another user.
diff --git a/src/maasserver/models/virtualblockdevice.py b/src/maasserver/models/virtualblockdevice.py
index b59be68..8c49d1d 100644
--- a/src/maasserver/models/virtualblockdevice.py
+++ b/src/maasserver/models/virtualblockdevice.py
@@ -82,7 +82,7 @@ class VirtualBlockDevice(BlockDevice):
             return self.name
 
     def clean(self, *args, **kwargs):
-        super(VirtualBlockDevice, self).clean(*args, **kwargs)
+        super().clean(*args, **kwargs)
 
         # First time called the node might not be set, so we handle the
         # DoesNotExist exception accordingly.
@@ -131,7 +131,7 @@ class VirtualBlockDevice(BlockDevice):
     def save(self, *args, **kwargs):
         if not self.uuid:
             self.uuid = uuid4()
-        return super(VirtualBlockDevice, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)
 
     def get_parents(self):
         """Return the blockdevices and partition which make up this device."""
diff --git a/src/maasserver/models/vlan.py b/src/maasserver/models/vlan.py
index 0450364..8df99b0 100644
--- a/src/maasserver/models/vlan.py
+++ b/src/maasserver/models/vlan.py
@@ -63,7 +63,7 @@ class VLANQueriesMixin(MAASQueriesMixin):
             "space": (Space.objects, "vlan"),
             "vid": self._add_vid_query,
         }
-        return super(VLANQueriesMixin, self).get_specifiers_q(
+        return super().get_specifiers_q(
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
@@ -274,7 +274,7 @@ class VLAN(CleanSave, TimestampedModel):
             )
         self.manage_connected_interfaces()
         self.manage_connected_subnets()
-        super(VLAN, self).delete()
+        super().delete()
 
     def save(self, *args, **kwargs):
         # Bug 1555759: Raise a Notification if there are no VLANs with DHCP
diff --git a/src/maasserver/models/zone.py b/src/maasserver/models/zone.py
index 151e46c..1cf3bf9 100644
--- a/src/maasserver/models/zone.py
+++ b/src/maasserver/models/zone.py
@@ -80,7 +80,7 @@ class Zone(CleanSave, TimestampedModel):
             raise ValidationError(
                 "This zone is the default zone, it cannot be deleted."
             )
-        super(Zone, self).delete()
+        super().delete()
 
     @property
     def node_only_set(self):
diff --git a/src/maasserver/node_action.py b/src/maasserver/node_action.py
index a09f42e..417e680 100644
--- a/src/maasserver/node_action.py
+++ b/src/maasserver/node_action.py
@@ -627,7 +627,7 @@ class PowerOff(NodeAction):
             raise NodeActionError(exception)
 
     def is_actionable(self):
-        is_actionable = super(PowerOff, self).is_actionable()
+        is_actionable = super().is_actionable()
         return is_actionable and (self.node.power_state != POWER_STATE.OFF)
 
 
@@ -699,7 +699,7 @@ class MarkBroken(NodeAction):
 
     def is_permitted(self):
         """Must also be owned to mark it broken."""
-        permitted = super(MarkBroken, self).is_permitted()
+        permitted = super().is_permitted()
         return permitted and self.node.owner_id == self.user.id
 
 
diff --git a/src/maasserver/node_constraint_filter_forms.py b/src/maasserver/node_constraint_filter_forms.py
index bf33269..19fe00a 100644
--- a/src/maasserver/node_constraint_filter_forms.py
+++ b/src/maasserver/node_constraint_filter_forms.py
@@ -221,7 +221,7 @@ JUJU_ACQUIRE_FORM_FIELDS_MAPPING = {
 # XXX JeroenVermeulen 2014-02-06: Can we document this please?
 class RenamableFieldsForm(forms.Form):
     def __init__(self, *args, **kwargs):
-        super(RenamableFieldsForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.field_mapping = {name: name for name in self.fields}
 
     def get_field_name(self, name):
@@ -599,7 +599,7 @@ def nodes_by_interface(
 
 class LabeledConstraintMapField(Field):
     def __init__(self, *args, **kwargs):
-        super(LabeledConstraintMapField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.validators.insert(
             0,
             lambda constraint_map: constraint_map.validate(
diff --git a/src/maasserver/nonces_cleanup.py b/src/maasserver/nonces_cleanup.py
index 9103314..99af8a7 100644
--- a/src/maasserver/nonces_cleanup.py
+++ b/src/maasserver/nonces_cleanup.py
@@ -102,6 +102,4 @@ class NonceCleanupService(TimerService, object):
 
     def __init__(self, interval=(24 * 60 * 60)):
         cleanup = synchronous(transactional(cleanup_old_nonces))
-        super(NonceCleanupService, self).__init__(
-            interval, deferToDatabase, cleanup
-        )
+        super().__init__(interval, deferToDatabase, cleanup)
diff --git a/src/maasserver/preseed.py b/src/maasserver/preseed.py
index 36c6567..b165401 100644
--- a/src/maasserver/preseed.py
+++ b/src/maasserver/preseed.py
@@ -761,7 +761,7 @@ class TemplateNotFoundError(Exception):
     """The template has not been found."""
 
     def __init__(self, name):
-        super(TemplateNotFoundError, self).__init__(name)
+        super().__init__(name)
         self.name = name
 
 
diff --git a/src/maasserver/prometheus/stats.py b/src/maasserver/prometheus/stats.py
index 3d5a5ea..865241f 100644
--- a/src/maasserver/prometheus/stats.py
+++ b/src/maasserver/prometheus/stats.py
@@ -252,7 +252,7 @@ class PrometheusService(TimerService, object):
     """
 
     def __init__(self, interval=PROMETHEUS_SERVICE_PERIOD):
-        super(PrometheusService, self).__init__(
+        super().__init__(
             interval.total_seconds(), self.maybe_push_prometheus_stats
         )
 
diff --git a/src/maasserver/rack_controller.py b/src/maasserver/rack_controller.py
index 453b751..b275e6e 100644
--- a/src/maasserver/rack_controller.py
+++ b/src/maasserver/rack_controller.py
@@ -69,7 +69,7 @@ class RackControllerService(Service):
         :param postgresListener: The `PostgresListenerService` that is running
             in this regiond process.
         """
-        super(RackControllerService, self).__init__()
+        super().__init__()
         self.clock = clock
         self.starting = None
         self.processing = LoopingCall(self.process)
@@ -83,7 +83,7 @@ class RackControllerService(Service):
     @asynchronous(timeout=FOREVER)
     def startService(self):
         """Start listening for messages."""
-        super(RackControllerService, self).startService()
+        super().startService()
 
         def cb_registerWithPostgres(processId):
             # Register the coreHandler with postgres.
@@ -135,7 +135,7 @@ class RackControllerService(Service):
     @asynchronous(timeout=FOREVER)
     def stopService(self):
         """Close the controller."""
-        super(RackControllerService, self).stopService()
+        super().stopService()
 
         def cleanUp():
             # Unregister the core handler.
diff --git a/src/maasserver/region_controller.py b/src/maasserver/region_controller.py
index eb232fb..bd073d6 100644
--- a/src/maasserver/region_controller.py
+++ b/src/maasserver/region_controller.py
@@ -79,7 +79,7 @@ class RegionControllerService(Service):
         :param postgresListener: The `PostgresListenerService` that is running
             in this regiond process.
         """
-        super(RegionControllerService, self).__init__()
+        super().__init__()
         self.clock = clock
         self.retryOnFailure = retryOnFailure
         self.rbacRetryOnFailureDelay = rbacRetryOnFailureDelay
@@ -103,7 +103,7 @@ class RegionControllerService(Service):
     @asynchronous(timeout=FOREVER)
     def startService(self):
         """Start listening for messages."""
-        super(RegionControllerService, self).startService()
+        super().startService()
         self.postgresListener.register("sys_dns", self.markDNSForUpdate)
         self.postgresListener.register("sys_proxy", self.markProxyForUpdate)
         self.postgresListener.register("sys_rbac", self.markRBACForUpdate)
@@ -114,7 +114,7 @@ class RegionControllerService(Service):
     @asynchronous(timeout=FOREVER)
     def stopService(self):
         """Close the controller."""
-        super(RegionControllerService, self).stopService()
+        super().stopService()
         self.postgresListener.events.connected.unregisterHandler(
             self.markAllForUpdate
         )
diff --git a/src/maasserver/regiondservices/service_monitor_service.py b/src/maasserver/regiondservices/service_monitor_service.py
index 1424555..fb33692 100644
--- a/src/maasserver/regiondservices/service_monitor_service.py
+++ b/src/maasserver/regiondservices/service_monitor_service.py
@@ -29,9 +29,7 @@ class ServiceMonitorService(TimerService, object):
 
     def __init__(self, clock=reactor):
         # Call self.monitorServices() every self.check_interval.
-        super(ServiceMonitorService, self).__init__(
-            self.check_interval, self.monitorServices
-        )
+        super().__init__(self.check_interval, self.monitorServices)
         self.clock = clock
 
     def monitorServices(self):
diff --git a/src/maasserver/regiondservices/tests/test_ntp.py b/src/maasserver/regiondservices/tests/test_ntp.py
index 1f15b7f..2e0fdff 100644
--- a/src/maasserver/regiondservices/tests/test_ntp.py
+++ b/src/maasserver/regiondservices/tests/test_ntp.py
@@ -63,7 +63,7 @@ class TestRegionNetworkTimeProtocolService(MAASTransactionServerTestCase):
     """Tests for `RegionNetworkTimeProtocolService`."""
 
     def setUp(self):
-        super(TestRegionNetworkTimeProtocolService, self).setUp()
+        super().setUp()
         self.useFixture(MAASRootFixture())
 
     @transactional
diff --git a/src/maasserver/regiondservices/tests/test_syslog.py b/src/maasserver/regiondservices/tests/test_syslog.py
index 5cc46a9..2fe3bcd 100644
--- a/src/maasserver/regiondservices/tests/test_syslog.py
+++ b/src/maasserver/regiondservices/tests/test_syslog.py
@@ -69,7 +69,7 @@ class TestRegionSyslogService(MAASTransactionServerTestCase):
     """Tests for `RegionSyslogService`."""
 
     def setUp(self):
-        super(TestRegionSyslogService, self).setUp()
+        super().setUp()
         self.useFixture(MAASRootFixture())
 
     @transactional
diff --git a/src/maasserver/rpc/regionservice.py b/src/maasserver/rpc/regionservice.py
index dde6640..552efe6 100644
--- a/src/maasserver/rpc/regionservice.py
+++ b/src/maasserver/rpc/regionservice.py
@@ -807,7 +807,7 @@ class RegionServer(Region):
                 return
 
     def connectionMade(self):
-        super(RegionServer, self).connectionMade()
+        super().connectionMade()
         self.connid = str(uuid.uuid4())
         if self.factory.service.running:
             return self.performHandshake().addErrback(self.handshakeFailed)
@@ -824,7 +824,7 @@ class RegionServer(Region):
             )
         self.factory.service._removeConnectionFor(self.ident, self)
         log.msg("Rack controller '%s' disconnected." % self.ident)
-        super(RegionServer, self).connectionLost(reason)
+        super().connectionLost(reason)
 
 
 def _get_call_latency_metric_labels(client, cmd, *args, **kwargs):
@@ -841,7 +841,7 @@ class RackClient(common.Client):
     cache_calls = [cluster.DescribePowerTypes, cluster.DescribeNOSTypes]
 
     def __init__(self, connection, cache):
-        super(RackClient, self).__init__(connection)
+        super().__init__(connection)
         self.cache = cache
 
     def _getCallCache(self):
@@ -866,7 +866,7 @@ class RackClient(common.Client):
         """
         call_cache = self._getCallCache()
         if cmd not in self.cache_calls:
-            return super(RackClient, self).__call__(cmd, *args, **kwargs)
+            return super().__call__(cmd, *args, **kwargs)
         if cmd in call_cache:
             # Call has already been made over this connection, just return
             # the original result.
@@ -880,7 +880,7 @@ class RackClient(common.Client):
                 call_cache[cmd] = result
                 return result
 
-            d = super(RackClient, self).__call__(cmd, *args, **kwargs)
+            d = super().__call__(cmd, *args, **kwargs)
             d.addCallback(cb_cache)
             return d
 
@@ -907,7 +907,7 @@ class RegionService(service.Service, object):
     starting = None
 
     def __init__(self, ipcWorker):
-        super(RegionService, self).__init__()
+        super().__init__()
         self.ipcWorker = ipcWorker
         self.endpoints = [
             [TCP6ServerEndpoint(reactor, port) for port in range(5250, 5260)]
@@ -1031,7 +1031,7 @@ class RegionService(service.Service, object):
     @asynchronous
     def startService(self):
         """Start listening on an ephemeral port."""
-        super(RegionService, self).startService()
+        super().startService()
         self.starting = defer.DeferredList(
             (
                 self._bindFirst(endpoint_options, self.factory)
@@ -1076,7 +1076,7 @@ class RegionService(service.Service, object):
                     yield conn.transport.loseConnection()
                 except Exception:
                     log.err(None, "Failure when closing RPC connection.")
-        yield super(RegionService, self).stopService()
+        yield super().stopService()
 
     @asynchronous(timeout=FOREVER)
     def getPort(self):
diff --git a/src/maasserver/rpc/testing/fixtures.py b/src/maasserver/rpc/testing/fixtures.py
index 4f33771..49fcfe6 100644
--- a/src/maasserver/rpc/testing/fixtures.py
+++ b/src/maasserver/rpc/testing/fixtures.py
@@ -50,7 +50,7 @@ def get_service_in_eventloop(name):
 @implementer(IConnection)
 class FakeConnection:
     def __init__(self, ident):
-        super(FakeConnection, self).__init__()
+        super().__init__()
         self.protocol = clusterservice.Cluster()
         self.ident = ident
 
@@ -72,7 +72,7 @@ class ClusterRPCFixture(fixtures.Fixture):
     """
 
     def __init__(self):
-        super(ClusterRPCFixture, self).__init__()
+        super().__init__()
         warn(
             (
                 "ClusterRPCFixture is deprecated; use "
@@ -82,7 +82,7 @@ class ClusterRPCFixture(fixtures.Fixture):
         )
 
     def setUp(self):
-        super(ClusterRPCFixture, self).setUp()
+        super().setUp()
         # We need the event-loop up and running.
         if not eventloop.loop.running:
             raise RuntimeError(
@@ -110,7 +110,7 @@ class RunningClusterRPCFixture(fixtures.Fixture):
     """
 
     def setUp(self):
-        super(RunningClusterRPCFixture, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("rpc"))
         self.useFixture(RunningEventLoopFixture())
         self.useFixture(ClusterRPCFixture())
@@ -148,7 +148,7 @@ class MockRegionToClusterRPCFixture(fixtures.Fixture):
     """
 
     def setUp(self):
-        super(MockRegionToClusterRPCFixture, self).setUp()
+        super().setUp()
         # Ensure there's a shared-secret.
         self.secret = security.get_shared_secret()
         # We need the event-loop up and running.
@@ -277,7 +277,7 @@ class MockLiveRegionToClusterRPCFixture(fixtures.Fixture):
         self.rpc.startService().wait(10)
 
     def setUp(self):
-        super(MockLiveRegionToClusterRPCFixture, self).setUp()
+        super().setUp()
         self.monkey = MonkeyPatcher()
         # We need the event-loop up and running.
         if not eventloop.loop.running:
diff --git a/src/maasserver/rpc/testing/mixins.py b/src/maasserver/rpc/testing/mixins.py
index e2bc881..baa5797 100644
--- a/src/maasserver/rpc/testing/mixins.py
+++ b/src/maasserver/rpc/testing/mixins.py
@@ -28,7 +28,7 @@ class PreseedRPCMixin:
     """
 
     def setUp(self):
-        super(PreseedRPCMixin, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("rpc"))
         self.useFixture(RunningEventLoopFixture())
         self.rpc_fixture = MockLiveRegionToClusterRPCFixture()
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 1c91b7a..8795f1d 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -82,7 +82,7 @@ class TestKparamsMerge(MAASServerTestCase):
 
 class TestGetConfig(MAASServerTestCase):
     def setUp(self):
-        super(TestGetConfig, self).setUp()
+        super().setUp()
         self.useFixture(RegionConfigurationFixture())
 
     def tearDown(self):
diff --git a/src/maasserver/rpc/tests/test_configuration.py b/src/maasserver/rpc/tests/test_configuration.py
index a6fb19d..7788fdd 100644
--- a/src/maasserver/rpc/tests/test_configuration.py
+++ b/src/maasserver/rpc/tests/test_configuration.py
@@ -16,7 +16,7 @@ from maastesting.factory import factory
 
 class TestGetProxies(MAASServerTestCase):
     def setUp(self):
-        super(TestGetProxies, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/rpc/tests/test_rackcontrollers.py b/src/maasserver/rpc/tests/test_rackcontrollers.py
index 482013d..429f04d 100644
--- a/src/maasserver/rpc/tests/test_rackcontrollers.py
+++ b/src/maasserver/rpc/tests/test_rackcontrollers.py
@@ -107,7 +107,7 @@ class TestHandleUpgrade(MAASServerTestCase):
 
 class TestRegisterRackController(MAASServerTestCase):
     def setUp(self):
-        super(TestRegisterRackController, self).setUp()
+        super().setUp()
         self.this_region = factory.make_RegionController()
         mock_running = self.patch(
             RegionController.objects, "get_running_controller"
diff --git a/src/maasserver/rpc/tests/test_regionservice_calls.py b/src/maasserver/rpc/tests/test_regionservice_calls.py
index 01ce0ff..72cddd1 100644
--- a/src/maasserver/rpc/tests/test_regionservice_calls.py
+++ b/src/maasserver/rpc/tests/test_regionservice_calls.py
@@ -239,7 +239,7 @@ class TestRegionProtocol_ReportBootImages(MAASTestCase):
 
 class TestRegionProtocol_UpdateLease(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestRegionProtocol_UpdateLease, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("database-tasks"))
 
     def test_update_lease_is_registered(self):
@@ -714,7 +714,7 @@ class TestRegionProtocol_RegisterEventType(MAASTransactionServerTestCase):
 
 class TestRegionProtocol_SendEvent(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestRegionProtocol_SendEvent, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("database-tasks"))
 
     def test_send_event_is_registered(self):
@@ -881,7 +881,7 @@ class TestRegionProtocol_SendEvent(MAASTransactionServerTestCase):
 
 class TestRegionProtocol_SendEventMACAddress(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestRegionProtocol_SendEventMACAddress, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("database-tasks"))
 
     def test_send_event_mac_address_is_registered(self):
@@ -1050,7 +1050,7 @@ class TestRegionProtocol_SendEventMACAddress(MAASTransactionServerTestCase):
 
 class TestRegionProtocol_UpdateServices(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestRegionProtocol_UpdateServices, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture("database-tasks"))
 
     def test_update_services_is_registered(self):
diff --git a/src/maasserver/sequence.py b/src/maasserver/sequence.py
index 9777065..a9f8b59 100644
--- a/src/maasserver/sequence.py
+++ b/src/maasserver/sequence.py
@@ -55,7 +55,7 @@ class Sequence:
         :param cycle: If this sequence should cycle or not.
         :param owner: The table.column that owns this sequence.
         """
-        super(Sequence, self).__init__()
+        super().__init__()
         self.name = name
         self.increment = increment
         self.minvalue = minvalue
diff --git a/src/maasserver/stats.py b/src/maasserver/stats.py
index 0466d13..3c8eb4e 100644
--- a/src/maasserver/stats.py
+++ b/src/maasserver/stats.py
@@ -266,7 +266,7 @@ class StatsService(TimerService, object):
     """
 
     def __init__(self, interval=STATS_SERVICE_PERIOD):
-        super(StatsService, self).__init__(
+        super().__init__(
             interval.total_seconds(), self.maybe_make_stats_request
         )
 
diff --git a/src/maasserver/status_monitor.py b/src/maasserver/status_monitor.py
index 11c77e5..a599621 100644
--- a/src/maasserver/status_monitor.py
+++ b/src/maasserver/status_monitor.py
@@ -220,6 +220,4 @@ class StatusMonitorService(TimerService, object):
     """
 
     def __init__(self, interval=60):
-        super(StatusMonitorService, self).__init__(
-            interval, deferToDatabase, check_status
-        )
+        super().__init__(interval, deferToDatabase, check_status)
diff --git a/src/maasserver/storage_layouts.py b/src/maasserver/storage_layouts.py
index 98d86bd..8bb191d 100644
--- a/src/maasserver/storage_layouts.py
+++ b/src/maasserver/storage_layouts.py
@@ -54,9 +54,7 @@ class StorageLayoutBase(Form):
     root_size = BytesOrPercentageField(required=False)
 
     def __init__(self, node, params: dict = None):
-        super(StorageLayoutBase, self).__init__(
-            data=({} if params is None else params)
-        )
+        super().__init__(data=({} if params is None else params))
         self.node = node
         self.block_devices = self._load_physical_block_devices()
         self.boot_disk = node.get_boot_disk()
@@ -141,7 +139,7 @@ class StorageLayoutBase(Form):
 
     def clean(self):
         """Validate the data."""
-        cleaned_data = super(StorageLayoutBase, self).clean()
+        cleaned_data = super().clean()
         if len(self.block_devices) == 0:
             raise StorageLayoutMissingBootDiskError(
                 "Node doesn't have any storage devices to configure."
@@ -425,7 +423,7 @@ class LVMStorageLayout(StorageLayoutBase):
 
     def clean(self):
         """Validate the lv_size."""
-        cleaned_data = super(LVMStorageLayout, self).clean()
+        cleaned_data = super().clean()
         lv_size = self.get_lv_size()
         if lv_size is not None:
             root_size = self.get_root_size()
@@ -634,7 +632,7 @@ class BcacheStorageLayoutBase(StorageLayoutBase):
         # Circular imports.
         from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
 
-        cleaned_data = super(BcacheStorageLayoutBase, self).clean()
+        cleaned_data = super().clean()
         cache_device = self.get_cache_device()
         cache_size = self.get_cache_size()
         cache_no_part = self.get_cache_no_part()
@@ -680,9 +678,7 @@ class BcacheStorageLayout(FlatStorageLayout, BcacheStorageLayoutBase):
     """
 
     def __init__(self, node, params: dict = None):
-        super(BcacheStorageLayout, self).__init__(
-            node, params=({} if params is None else params)
-        )
+        super().__init__(node, params=({} if params is None else params))
         self.setup_cache_device_field()
 
     def configure_storage(self, allow_fallback):
@@ -695,9 +691,7 @@ class BcacheStorageLayout(FlatStorageLayout, BcacheStorageLayoutBase):
         if cache_block_device is None:
             if allow_fallback:
                 # No cache device so just configure using the flat layout.
-                return super(BcacheStorageLayout, self).configure_storage(
-                    allow_fallback
-                )
+                return super().configure_storage(allow_fallback)
             else:
                 raise StorageLayoutError(
                     "Node doesn't have an available cache device to "
@@ -958,7 +952,7 @@ class StorageLayoutForm(Form):
 
     def __init__(self, *args, **kwargs):
         required = kwargs.pop("required", False)
-        super(StorageLayoutForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.setup_field(required=required)
 
     def setup_field(self, required=False):
diff --git a/src/maasserver/testing/api.py b/src/maasserver/testing/api.py
index c09cd3f..9cd5f39 100644
--- a/src/maasserver/testing/api.py
+++ b/src/maasserver/testing/api.py
@@ -136,7 +136,7 @@ class APITestCaseBase(MAASTestCase, metaclass=APITestType):
     client = None
 
     def __init__(self, *args, **kwargs):
-        super(APITestCaseBase, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # Create scenarios for userfactories and clientfactories.
         scenarios_users = tuple(
             ("user=%s" % name, {"userfactory": self.userfactories[name]})
@@ -172,7 +172,7 @@ class APITestCaseBase(MAASTestCase, metaclass=APITestType):
             raise AssertionError(
                 "Do not set client; set clientfactory instead."
             )
-        super(APITestCaseBase, self).setUp()
+        super().setUp()
         self.user = self.userfactory()
         self.client = self.clientfactory()
         self.client.login(user=self.user)
diff --git a/src/maasserver/testing/database.py b/src/maasserver/testing/database.py
index 582de9b..6e54002 100644
--- a/src/maasserver/testing/database.py
+++ b/src/maasserver/testing/database.py
@@ -19,7 +19,7 @@ class MAASClusterFixture(ClusterFixture):
         self.connection = connections[
             DEFAULT_DB_ALIAS if database is None else database
         ]
-        super(MAASClusterFixture, self).__init__(
+        super().__init__(
             datadir=self.connection.settings_dict["HOST"], preserve=True
         )
 
@@ -28,5 +28,5 @@ class MAASClusterFixture(ClusterFixture):
         return self.connection.settings_dict["NAME"]
 
     def setUp(self):
-        super(MAASClusterFixture, self).setUp()
+        super().setUp()
         self.createdb(self.dbname)
diff --git a/src/maasserver/testing/eventloop.py b/src/maasserver/testing/eventloop.py
index 7355d35..ef8278d 100644
--- a/src/maasserver/testing/eventloop.py
+++ b/src/maasserver/testing/eventloop.py
@@ -27,7 +27,7 @@ class RegionEventLoopFixture(Fixture):
     """
 
     def __init__(self, *services):
-        super(RegionEventLoopFixture, self).__init__()
+        super().__init__()
         self.services = services
 
     def checkEventLoopClean(self):
@@ -52,7 +52,7 @@ class RegionEventLoopFixture(Fixture):
         eventloop.loop.services._set_globals = self.original_set_globals
 
     def setUp(self):
-        super(RegionEventLoopFixture, self).setUp()
+        super().setUp()
         # Patch start_up in the eventloop.
         self.original_prepare = eventloop.loop.prepare
         self.original_set_globals = eventloop.loop.services._set_globals
@@ -108,7 +108,7 @@ class RunningEventLoopFixture(Fixture):
         eventloop.loop.services._set_globals = self.original_set_globals
 
     def setUp(self):
-        super(RunningEventLoopFixture, self).setUp()
+        super().setUp()
         # Patch start_up in the eventloop.
         self.original_prepare = eventloop.loop.prepare
         self.original_set_globals = eventloop.loop.services._set_globals
diff --git a/src/maasserver/testing/fixtures.py b/src/maasserver/testing/fixtures.py
index e8a720a..1350fd8 100644
--- a/src/maasserver/testing/fixtures.py
+++ b/src/maasserver/testing/fixtures.py
@@ -55,7 +55,7 @@ class LogSQL(fixtures.Fixture):
     """
 
     def __init__(self, include_stacktrace=False):
-        super(LogSQL, self).__init__()
+        super().__init__()
         self.include_stacktrace = include_stacktrace
 
     def _setUp(self):
diff --git a/src/maasserver/testing/matchers.py b/src/maasserver/testing/matchers.py
index f92d40d..27725d3 100644
--- a/src/maasserver/testing/matchers.py
+++ b/src/maasserver/testing/matchers.py
@@ -33,7 +33,7 @@ class HasStatusCode(Matcher):
     """
 
     def __init__(self, status_code):
-        super(HasStatusCode, self).__init__()
+        super().__init__()
         self.status_code = status_code
 
     def match(self, response):
@@ -70,4 +70,4 @@ class MatchesSetwiseWithAll(MatchesSetwise):
     """
 
     def match(self, observed):
-        return super(MatchesSetwiseWithAll, self).match(observed.all())
+        return super().match(observed.all())
diff --git a/src/maasserver/testing/orm.py b/src/maasserver/testing/orm.py
index 077bc63..74f4fde 100644
--- a/src/maasserver/testing/orm.py
+++ b/src/maasserver/testing/orm.py
@@ -44,7 +44,7 @@ class PostCommitHooksTestMixin(testtools.TestCase):
 
     def setUp(self):
         try:
-            super(PostCommitHooksTestMixin, self).setUp()
+            super().setUp()
             description_of_hooks = "\n".join(
                 gen_description_of_hooks(post_commit_hooks.hooks)
             )
@@ -71,7 +71,7 @@ class PostCommitHooksTestMixin(testtools.TestCase):
                 "One or more post-commit tasks were present at the end of "
                 "this test.\n" + description_of_hooks,
             )
-            super(PostCommitHooksTestMixin, self).tearDown()
+            super().tearDown()
         finally:
             # By this point we will have reported the leaked post-commit
             # tasks, so always reset them; we don't want to report them again,
diff --git a/src/maasserver/testing/resources.py b/src/maasserver/testing/resources.py
index ad15d71..550f4b7 100644
--- a/src/maasserver/testing/resources.py
+++ b/src/maasserver/testing/resources.py
@@ -186,7 +186,7 @@ class DjangoDatabasesManager(TestResourceManager):
     resources = (("templates", DjangoPristineDatabaseManager()),)
 
     def __init__(self, assume_dirty=True):
-        super(DjangoDatabasesManager, self).__init__()
+        super().__init__()
         self._count = count(1)
         self.dirty = assume_dirty
 
diff --git a/src/maasserver/testing/testcase.py b/src/maasserver/testing/testcase.py
index bde2559..6931d44 100644
--- a/src/maasserver/testing/testcase.py
+++ b/src/maasserver/testing/testcase.py
@@ -70,12 +70,12 @@ class MAASRegionTestCaseBase(PostCommitHooksTestMixin):
 
     @classmethod
     def setUpClass(cls):
-        super(MAASRegionTestCaseBase, cls).setUpClass()
+        super().setUpClass()
         register_mac_type(connection.cursor())
 
     def setUp(self):
         reset_queries()  # Formerly this was handled by... Django?
-        super(MAASRegionTestCaseBase, self).setUp()
+        super().setUp()
 
     def setUpFixtures(self):
         """This should be called by a subclass once other set-up is done."""
@@ -106,11 +106,11 @@ class MAASLegacyServerTestCase(MAASRegionTestCaseBase, DjangoTestCase):
     """
 
     def setUp(self):
-        super(MAASLegacyServerTestCase, self).setUp()
+        super().setUp()
         self.setUpFixtures()
 
     def setUpFixtures(self):
-        super(MAASLegacyServerTestCase, self).setUpFixtures()
+        super().setUpFixtures()
         # XXX: allenap bug=1427628 2015-03-03: This should not be here.
         self.useFixture(PackageRepositoryFixture())
 
@@ -124,11 +124,11 @@ class MAASLegacyTransactionServerTestCase(
     """
 
     def setUp(self):
-        super(MAASLegacyTransactionServerTestCase, self).setUp()
+        super().setUp()
         self.setUpFixtures()
 
     def setUpFixtures(self):
-        super(MAASLegacyTransactionServerTestCase, self).setUpFixtures()
+        super().setUpFixtures()
         # XXX: allenap bug=1427628 2015-03-03: This should not be here.
         self.useFixture(PackageRepositoryFixture())
 
@@ -142,7 +142,7 @@ class MAASServerTestCase(MAASRegionTestCaseBase, MAASTestCase):
     database_use_permitted = True
 
     def setUp(self):
-        super(MAASServerTestCase, self).setUp()
+        super().setUp()
         self.beginTransaction()
         self.addCleanup(self.endTransaction)
         self.setUpFixtures()
@@ -179,7 +179,7 @@ class MAASTransactionServerTestCase(MAASRegionTestCaseBase, MAASTestCase):
     database_use_permitted = True
 
     def setUp(self):
-        super(MAASTransactionServerTestCase, self).setUp()
+        super().setUp()
         self.assertNotInTransaction()
         self.addCleanup(self.assertNotInTransaction)
         self.setUpFixtures()
@@ -197,7 +197,7 @@ class SerializationFailureTestCase(
             cursor.execute("DROP TABLE IF EXISTS stest")
 
     def setUp(self):
-        super(SerializationFailureTestCase, self).setUp()
+        super().setUp()
         self.create_stest_table()
         # Put something into the stest table upon which to trigger a
         # serialization failure.
@@ -206,7 +206,7 @@ class SerializationFailureTestCase(
                 cursor.execute("INSERT INTO stest VALUES (1)")
 
     def tearDown(self):
-        super(SerializationFailureTestCase, self).tearDown()
+        super().tearDown()
         self.drop_stest_table()
 
     def cause_serialization_failure(self):
@@ -282,12 +282,12 @@ class UniqueViolationTestCase(
             cursor.execute("DROP TABLE IF EXISTS uvtest")
 
     def setUp(self):
-        super(UniqueViolationTestCase, self).setUp()
+        super().setUp()
         self.conflicting_values = count(1)
         self.create_uvtest_table()
 
     def tearDown(self):
-        super(UniqueViolationTestCase, self).tearDown()
+        super().tearDown()
         self.drop_uvtest_table()
 
     def cause_unique_violation(self):
diff --git a/src/maasserver/testing/testclient.py b/src/maasserver/testing/testclient.py
index 5fa4e8f..3905430 100644
--- a/src/maasserver/testing/testclient.py
+++ b/src/maasserver/testing/testclient.py
@@ -39,7 +39,7 @@ class MAASSensibleGetPathMixin:
         script_path = settings.FORCE_SCRIPT_NAME.rstrip("/")
         if parsed.path.startswith(script_path):
             parsed = parsed._replace(path=parsed.path[len(script_path) :])
-        return super(MAASSensibleGetPathMixin, self)._get_path(parsed)
+        return super()._get_path(parsed)
 
 
 class MAASSensibleRequestFactory(MAASSensibleGetPathMixin, RequestFactory):
@@ -60,7 +60,7 @@ class MAASSensibleClient(MAASSensibleGetPathMixin, SensibleClient):
         # Make sure that requests are done within a transaction. Some kinds of
         # tests will already have a transaction in progress, in which case
         # this will act like a sub-transaction, but that's fine.
-        upcall = transactional(super(MAASSensibleClient, self).request)
+        upcall = transactional(super().request)
         # If we're outside of a transaction right now then the transactional()
         # wrapper above will ensure that post-commit hooks are run or reset on
         # return from the request. However, we want to ensure that post-commit
@@ -71,7 +71,7 @@ class MAASSensibleClient(MAASSensibleGetPathMixin, SensibleClient):
     @transactional
     def login(self, *, user=None, **credentials):
         if user is None:
-            return super(MAASSensibleClient, self).login(**credentials)
+            return super().login(**credentials)
         elif user.is_anonymous:
             self.logout()
             return False
@@ -80,7 +80,7 @@ class MAASSensibleClient(MAASSensibleGetPathMixin, SensibleClient):
             credentials["username"] = user.username
             user.set_password(password)
             user.save()
-            return super(MAASSensibleClient, self).login(**credentials)
+            return super().login(**credentials)
 
 
 class MAASSensibleOAuthClient(MAASSensibleClient):
@@ -95,7 +95,7 @@ class MAASSensibleOAuthClient(MAASSensibleClient):
             no `token` is given, the user's first token will be used.
         :type token: oauth.oauth.OAuthToken
         """
-        super(MAASSensibleOAuthClient, self).__init__()
+        super().__init__()
         if user is not None or token is not None:
             self.login(user=user, token=token)
         else:
@@ -158,4 +158,4 @@ class MAASSensibleOAuthClient(MAASSensibleClient):
         url = self._compose_url(kwargs["PATH_INFO"])
         if self.consumer is not None:
             kwargs.update(self._compose_auth_header(url))
-        return super(MAASSensibleOAuthClient, self).request(**kwargs)
+        return super().request(**kwargs)
diff --git a/src/maasserver/tests/test_bootresources.py b/src/maasserver/tests/test_bootresources.py
index 10d6e1f..c0129c5 100644
--- a/src/maasserver/tests/test_bootresources.py
+++ b/src/maasserver/tests/test_bootresources.py
@@ -133,7 +133,7 @@ class SimplestreamsEnvFixture(Fixture):
     simplestreams."""
 
     def setUp(self):
-        super(SimplestreamsEnvFixture, self).setUp()
+        super().setUp()
         prior_env = {}
         for key in ["GNUPGHOME", "http_proxy", "https_proxy"]:
             prior_env[key] = os.environ.get(key, "")
@@ -565,7 +565,7 @@ class TestConnectionWrapper(MAASTransactionServerTestCase):
 
         class AssertConnectionWrapper(bootresources.ConnectionWrapper):
             def _set_up(self):
-                super(AssertConnectionWrapper, self)._set_up()
+                super()._set_up()
                 # Capture the created connection
                 AssertConnectionWrapper.connection = self._connection
 
@@ -1603,7 +1603,7 @@ class TestSetGlobalDefaultReleases(MAASServerTestCase):
 
 class TestImportImages(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestImportImages, self).setUp()
+        super().setUp()
         self.useFixture(SimplestreamsEnvFixture())
         # Don't create the gnupg home directory.
         self.patch_autospec(bootresources, "create_gnupg_home")
diff --git a/src/maasserver/tests/test_bootsources.py b/src/maasserver/tests/test_bootsources.py
index 69e3fe3..797efeb 100644
--- a/src/maasserver/tests/test_bootsources.py
+++ b/src/maasserver/tests/test_bootsources.py
@@ -99,7 +99,7 @@ def make_boot_image_mapping(image_specs=None):
 
 class TestHelpers(MAASServerTestCase):
     def setUp(self):
-        super(TestHelpers, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources_signals.enable)
         bootsources_signals.disable()
@@ -224,7 +224,7 @@ class TestHelpers(MAASServerTestCase):
 
 class TestGetOSInfoFromBootSources(MAASServerTestCase):
     def setUp(self):
-        super(TestGetOSInfoFromBootSources, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources_signals.enable)
         bootsources_signals.disable()
@@ -265,7 +265,7 @@ class TestGetOSInfoFromBootSources(MAASServerTestCase):
 
 class TestPrivateUpdateCache(MAASServerTestCase):
     def setUp(self):
-        super(TestPrivateUpdateCache, self).setUp()
+        super().setUp()
         self.useFixture(SimplestreamsEnvFixture())
         # Disable boot source cache signals.
         self.addCleanup(bootsources_signals.enable)
@@ -344,7 +344,7 @@ class TestPrivateUpdateCache(MAASServerTestCase):
 
 class TestPrivateCacheBootSources(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestPrivateCacheBootSources, self).setUp()
+        super().setUp()
         self.useFixture(SimplestreamsEnvFixture())
         # Disable boot source cache signals.
         self.addCleanup(bootsources_signals.enable)
@@ -553,7 +553,7 @@ class TestPrivateCacheBootSources(MAASTransactionServerTestCase):
 
 class TestBadConnectionHandling(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestBadConnectionHandling, self).setUp()
+        super().setUp()
         self.useFixture(SimplestreamsEnvFixture())
         # Disable boot source cache signals.
         self.addCleanup(bootsources_signals.enable)
diff --git a/src/maasserver/tests/test_commands_edit_named_options.py b/src/maasserver/tests/test_commands_edit_named_options.py
index 20e2c41..23c256f 100644
--- a/src/maasserver/tests/test_commands_edit_named_options.py
+++ b/src/maasserver/tests/test_commands_edit_named_options.py
@@ -86,7 +86,7 @@ OPTIONS_FILE_WITH_EXTRA_AND_DUP_FORWARDER = textwrap.dedent(
 
 class TestEditNamedOptionsCommand(MAASServerTestCase):
     def setUp(self):
-        super(TestEditNamedOptionsCommand, self).setUp()
+        super().setUp()
         self.stdout = StringIO()
 
     def assertFailsWithMessage(self, config_path, message):
diff --git a/src/maasserver/tests/test_ipc.py b/src/maasserver/tests/test_ipc.py
index 568b4f2..f46cf67 100644
--- a/src/maasserver/tests/test_ipc.py
+++ b/src/maasserver/tests/test_ipc.py
@@ -75,7 +75,7 @@ class TestIPCCommunication(MAASTransactionServerTestCase):
     run_tests_with = MAASCrochetRunTest
 
     def setUp(self):
-        super(TestIPCCommunication, self).setUp()
+        super().setUp()
         self.ipc_path = os.path.join(
             self.useFixture(TempDirectory()).path, "maas-regiond.sock"
         )
diff --git a/src/maasserver/tests/test_ntp.py b/src/maasserver/tests/test_ntp.py
index 9bd20ca..8670bbf 100644
--- a/src/maasserver/tests/test_ntp.py
+++ b/src/maasserver/tests/test_ntp.py
@@ -57,7 +57,7 @@ class TestGetServersFor_ExternalOnly(MAASServerTestCase):
     )
 
     def setUp(self):
-        super(TestGetServersFor_ExternalOnly, self).setUp()
+        super().setUp()
         Config.objects.set_config("ntp_external_only", True)
 
     def test_yields_nothing_when_no_ntp_servers_defined(self):
@@ -79,7 +79,7 @@ class TestGetServersFor_Common(MAASServerTestCase):
     """
 
     def setUp(self):
-        super(TestGetServersFor_Common, self).setUp()
+        super().setUp()
         Config.objects.set_config("ntp_external_only", False)
 
 
@@ -259,7 +259,7 @@ class TestGetServersFor_Selection(MAASServerTestCase):
     )
 
     def setUp(self):
-        super(TestGetServersFor_Selection, self).setUp()
+        super().setUp()
         Config.objects.set_config("ntp_external_only", False)
 
     def test_prefers_closest_addresses(self):
diff --git a/src/maasserver/tests/test_plugin.py b/src/maasserver/tests/test_plugin.py
index c39017d..cfe7225 100644
--- a/src/maasserver/tests/test_plugin.py
+++ b/src/maasserver/tests/test_plugin.py
@@ -64,7 +64,7 @@ class TestServiceMaker(MAASTestCase):
     """Mixin with helpers for all the service marker tests."""
 
     def setUp(self):
-        super(TestServiceMaker, self).setUp()
+        super().setUp()
         self.patch(eventloop.loop, "services", MultiService())
         # Prevent setting the pdeathsig in tests.
         self.patch_autospec(RegionWorkerServiceMaker, "_set_pdeathsig")
@@ -75,7 +75,7 @@ class TestServiceMaker(MAASTestCase):
         import_websocket_handlers()
 
     def tearDown(self):
-        super(TestServiceMaker, self).tearDown()
+        super().tearDown()
         # Disable database access in the reactor again.
         asynchronous(disable_all_database_connections, timeout=5)()
 
diff --git a/src/maasserver/tests/test_preseed.py b/src/maasserver/tests/test_preseed.py
index b2708ed..3bd1ccd 100644
--- a/src/maasserver/tests/test_preseed.py
+++ b/src/maasserver/tests/test_preseed.py
@@ -334,7 +334,7 @@ class TestLoadPreseedTemplate(MAASServerTestCase):
     """Tests for `load_preseed_template`."""
 
     def setUp(self):
-        super(TestLoadPreseedTemplate, self).setUp()
+        super().setUp()
         self.location = self.make_dir()
         self.patch(settings, "PRESEED_TEMPLATE_LOCATIONS", [self.location])
 
diff --git a/src/maasserver/tests/test_proxyconfig.py b/src/maasserver/tests/test_proxyconfig.py
index ed834b6..7528e53 100644
--- a/src/maasserver/tests/test_proxyconfig.py
+++ b/src/maasserver/tests/test_proxyconfig.py
@@ -32,7 +32,7 @@ class TestProxyUpdateConfig(MAASTransactionServerTestCase):
     """Tests for `maasserver.proxyconfig`."""
 
     def setUp(self):
-        super(TestProxyUpdateConfig, self).setUp()
+        super().setUp()
         self.tmpdir = self.make_dir()
         self.proxy_path = Path(self.tmpdir) / config.MAAS_PROXY_CONF_NAME
         self.service_monitor = self.patch(proxyconfig, "service_monitor")
diff --git a/src/maasserver/tests/test_start_up.py b/src/maasserver/tests/test_start_up.py
index 9c28f3c..ea173df 100644
--- a/src/maasserver/tests/test_start_up.py
+++ b/src/maasserver/tests/test_start_up.py
@@ -47,11 +47,11 @@ class TestStartUp(MAASTransactionServerTestCase):
     """
 
     def setUp(self):
-        super(TestStartUp, self).setUp()
+        super().setUp()
         self.useFixture(RegionEventLoopFixture())
 
     def tearDown(self):
-        super(TestStartUp, self).tearDown()
+        super().tearDown()
         # start_up starts the Twisted event loop, so we need to stop it.
         eventloop.reset().wait(5)
 
@@ -93,7 +93,7 @@ class TestInnerStartUp(MAASServerTestCase):
     """Tests for the actual work done in `inner_start_up`."""
 
     def setUp(self):
-        super(TestInnerStartUp, self).setUp()
+        super().setUp()
         self.useFixture(MAASIDFixture(None))
         self.patch_autospec(start_up, "dns_kms_setting_changed")
         self.patch_autospec(start_up, "load_builtin_scripts")
diff --git a/src/maasserver/tests/test_webapp.py b/src/maasserver/tests/test_webapp.py
index 1e7b959..04121d2 100644
--- a/src/maasserver/tests/test_webapp.py
+++ b/src/maasserver/tests/test_webapp.py
@@ -175,7 +175,7 @@ class TestResourceOverlay(MAASTestCase):
 
 class TestWebApplicationService(MAASTestCase):
     def setUp(self):
-        super(TestWebApplicationService, self).setUp()
+        super().setUp()
         # Patch the getServiceNamed so the WebSocketFactory does not
         # error trying to register for events from the RPC service. In this
         # test the RPC service is not started.
diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
index 42d50bd..c9a981f 100644
--- a/src/maasserver/triggers/tests/test_websocket_listener.py
+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
@@ -3610,7 +3610,7 @@ class TestMachineFilesystemListener(
     )
 
     def setUp(self):
-        super(TestMachineFilesystemListener, self).setUp()
+        super().setUp()
         register_websocket_triggers()
 
     def test_calls_handler_with_update_on_create_fs_on_partition(self):
diff --git a/src/maasserver/utils/asynchronous.py b/src/maasserver/utils/asynchronous.py
index 455a1f0..b4dde3e 100644
--- a/src/maasserver/utils/asynchronous.py
+++ b/src/maasserver/utils/asynchronous.py
@@ -165,7 +165,7 @@ class DeferredHooks(threading.local):
     """
 
     def __init__(self):
-        super(DeferredHooks, self).__init__()
+        super().__init__()
         self.hooks = deque()
 
     @synchronous
diff --git a/src/maasserver/utils/dblocks.py b/src/maasserver/utils/dblocks.py
index 965e9ca..ad5e683 100644
--- a/src/maasserver/utils/dblocks.py
+++ b/src/maasserver/utils/dblocks.py
@@ -121,10 +121,10 @@ class DatabaseLockBase(tuple):
     objid = property(itemgetter(1))
 
     def __new__(cls, objid, mode=None):
-        return super(DatabaseLockBase, cls).__new__(cls, (classid, objid))
+        return super().__new__(cls, (classid, objid))
 
     def __init__(self, objid, mode=None):
-        super(DatabaseLockBase, self).__init__()
+        super().__init__()
         if mode is None:
             self.lock, self.unlock = self.MODE_DEFAULT
         elif mode in self.MODE_CHOICES:
diff --git a/src/maasserver/utils/dbtasks.py b/src/maasserver/utils/dbtasks.py
index 164d08d..089a3a3 100644
--- a/src/maasserver/utils/dbtasks.py
+++ b/src/maasserver/utils/dbtasks.py
@@ -47,7 +47,7 @@ class DatabaseTasksService(Service, object):
 
     def __init__(self):
         """Initialise a new `DatabaseTasksService`."""
-        super(DatabaseTasksService, self).__init__()
+        super().__init__()
         # Start with a queue that rejects puts.
         self.queue = DeferredQueue(size=0, backlog=1)
 
@@ -122,7 +122,7 @@ class DatabaseTasksService(Service, object):
 
         :return: `None`
         """
-        super(DatabaseTasksService, self).startService()
+        super().startService()
         self.queue.size = None  # Open queue to puts.
         self.coop = cooperate(self._generateTasks())
 
@@ -132,7 +132,7 @@ class DatabaseTasksService(Service, object):
 
         :return: :class:`Deferred` which fires once all tasks have been run.
         """
-        super(DatabaseTasksService, self).stopService()
+        super().stopService()
         # Feed the cooperative task so that it can shutdown.
         self.queue.put(self.sentinel)  # See _generateTasks.
         self.queue.size = 0  # Now close queue to puts.
diff --git a/src/maasserver/utils/orm.py b/src/maasserver/utils/orm.py
index 582cc49..2f7c442 100644
--- a/src/maasserver/utils/orm.py
+++ b/src/maasserver/utils/orm.py
@@ -378,7 +378,7 @@ class RetryStack(ExitStack):
     """An exit stack specialised to the retry machinery."""
 
     def __init__(self):
-        super(RetryStack, self).__init__()
+        super().__init__()
         self._cm_pending = deque()
         self._cm_seen = set()
 
@@ -414,7 +414,7 @@ class RetryContext(threading.local):
     """
 
     def __init__(self):
-        super(RetryContext, self).__init__()
+        super().__init__()
         self.stack = None
 
     @property
diff --git a/src/maasserver/utils/signals.py b/src/maasserver/utils/signals.py
index 8606008..6e99f66 100644
--- a/src/maasserver/utils/signals.py
+++ b/src/maasserver/utils/signals.py
@@ -132,7 +132,7 @@ class SignalsManager:
     """
 
     def __init__(self):
-        super(SignalsManager, self).__init__()
+        super().__init__()
         self._signals = set()
         self._signals_connected = set()
         self._signals_disconnected = set()
diff --git a/src/maasserver/utils/tests/test_dblocks.py b/src/maasserver/utils/tests/test_dblocks.py
index 482cdfd..48afa2c 100644
--- a/src/maasserver/utils/tests/test_dblocks.py
+++ b/src/maasserver/utils/tests/test_dblocks.py
@@ -81,7 +81,7 @@ class TestDatabaseLock(MAASTransactionServerTestCase):
         return dblocks.DatabaseLock(objid, mode=self.mode)
 
     def tearDown(self):
-        super(TestDatabaseLock, self).tearDown()
+        super().tearDown()
         with closing(connection.cursor()) as cursor:
             cursor.execute("SELECT pg_advisory_unlock_all()")
 
diff --git a/src/maasserver/utils/tests/test_keys.py b/src/maasserver/utils/tests/test_keys.py
index 482176f..2560c5e 100644
--- a/src/maasserver/utils/tests/test_keys.py
+++ b/src/maasserver/utils/tests/test_keys.py
@@ -33,7 +33,7 @@ from maastesting.matchers import MockCalledOnceWith
 
 class TestKeys(MAASServerTestCase):
     def setUp(self):
-        super(TestKeys, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources_signals.enable)
         bootsources_signals.disable()
diff --git a/src/maasserver/utils/tests/test_orm.py b/src/maasserver/utils/tests/test_orm.py
index b76d709..a15d139 100644
--- a/src/maasserver/utils/tests/test_orm.py
+++ b/src/maasserver/utils/tests/test_orm.py
@@ -94,7 +94,7 @@ class NoSleepMixin(unittest.TestCase):
     """Test case mix-in to prevent real sleeps in the `orm` module."""
 
     def setUp(self):
-        super(NoSleepMixin, self).setUp()
+        super().setUp()
         self.patch(orm, "sleep", lambda _: None)
 
 
@@ -973,7 +973,7 @@ class TestPostCommit(MAASTestCase):
     """Tests for the `post_commit` function."""
 
     def setUp(self):
-        super(TestPostCommit, self).setUp()
+        super().setUp()
         self.addCleanup(post_commit_hooks.reset)
 
     def test_adds_Deferred_as_hook(self):
@@ -1048,7 +1048,7 @@ class TestPostCommitDo(MAASTestCase):
     """Tests for the `post_commit_do` function."""
 
     def setUp(self):
-        super(TestPostCommitDo, self).setUp()
+        super().setUp()
         self.addCleanup(post_commit_hooks.reset)
 
     def test_adds_callable_as_hook(self):
diff --git a/src/maasserver/utils/tests/test_utils.py b/src/maasserver/utils/tests/test_utils.py
index b62baef..b474360 100644
--- a/src/maasserver/utils/tests/test_utils.py
+++ b/src/maasserver/utils/tests/test_utils.py
@@ -114,7 +114,7 @@ class TestBuildAbsoluteURI(MAASTestCase):
     """Tests for `build_absolute_uri`."""
 
     def setUp(self):
-        super(TestBuildAbsoluteURI, self).setUp()
+        super().setUp()
         self.useFixture(RegionConfigurationFixture())
 
     def make_request(
diff --git a/src/maasserver/utils/tests/test_views.py b/src/maasserver/utils/tests/test_views.py
index 30a9f0f..dd6a5e8 100644
--- a/src/maasserver/utils/tests/test_views.py
+++ b/src/maasserver/utils/tests/test_views.py
@@ -177,7 +177,7 @@ class TestDeleteOAuthNonce(MAASServerTestCase):
 
 class TestWebApplicationHandler(SerializationFailureTestCase):
     def setUp(self):
-        super(TestWebApplicationHandler, self).setUp()
+        super().setUp()
         # Wire time.sleep() directly up to clock.advance() to avoid needless
         # sleeps, and to simulate the march of time without intervention.
         clock = self.patch(views, "clock", Clock())
diff --git a/src/maasserver/utils/views.py b/src/maasserver/utils/views.py
index b35baff..ebc9df8 100644
--- a/src/maasserver/utils/views.py
+++ b/src/maasserver/utils/views.py
@@ -133,9 +133,7 @@ def request_headers(request):
 
 class MAASDjangoTemplateResponse(SimpleTemplateResponse):
     def __init__(self, response=None):
-        super(MAASDjangoTemplateResponse, self).__init__(
-            "%d.html" % self.status_code
-        )
+        super().__init__("%d.html" % self.status_code)
 
         # If we are passed an original response object 'response',
         # transfer over the content from the original response
@@ -167,7 +165,7 @@ class WebApplicationHandler(WSGIHandler):
     """
 
     def __init__(self, attempts=10, timeout=90.0):
-        super(WebApplicationHandler, self).__init__()
+        super().__init__()
         assert attempts >= 1, "The minimum attempts is 1, not %d" % attempts
         self.__retry_attempts = attempts
         self.__retry_timeout = timeout
@@ -284,7 +282,7 @@ class WebApplicationHandler(WSGIHandler):
         with this savepoint will be discarded.
 
         """
-        view_atomic = super(WebApplicationHandler, self).make_view_atomic(view)
+        view_atomic = super().make_view_atomic(view)
 
         def view_atomic_with_post_commit_savepoint(*args, **kwargs):
             with post_commit_hooks.savepoint():
@@ -300,7 +298,7 @@ class WebApplicationHandler(WSGIHandler):
         will *not* run within the same transaction, or any transaction at all
         by default.
         """
-        django_get_response = super(WebApplicationHandler, self).get_response
+        django_get_response = super().get_response
 
         def get_response(request):
             # Up-call to Django's get_response() in a transaction. This
diff --git a/src/maasserver/views/tests/test_rpc.py b/src/maasserver/views/tests/test_rpc.py
index 87b5ab1..aee3d4b 100644
--- a/src/maasserver/views/tests/test_rpc.py
+++ b/src/maasserver/views/tests/test_rpc.py
@@ -34,7 +34,7 @@ is_valid_port = MatchesAll(IsInstance(int), GreaterThan(0), LessThan(2 ** 16))
 
 class RPCViewTest(MAASTransactionServerTestCase):
     def setUp(self):
-        super(RPCViewTest, self).setUp()
+        super().setUp()
         self.maas_id = None
 
         def set_maas_id(maas_id):
diff --git a/src/maasserver/webapp.py b/src/maasserver/webapp.py
index ad791ef..53bcaff 100644
--- a/src/maasserver/webapp.py
+++ b/src/maasserver/webapp.py
@@ -52,9 +52,7 @@ class CleanPathRequest(Request, object):
         path, sep, args = path.partition(b"?")
         path = re.sub(rb"/+", b"/", path)
         path = b"".join([path, sep, args])
-        return super(CleanPathRequest, self).requestReceived(
-            command, path, version
-        )
+        return super().requestReceived(command, path, version)
 
 
 class OverlaySite(Site):
@@ -93,7 +91,7 @@ class OverlaySite(Site):
                     raise
 
         postpath = copy.copy(request.postpath)
-        result = super(OverlaySite, self).getResourceFor(request)
+        result = super().getResourceFor(request)
         if isinstance(result, NoResource) and self.underlay is not None:
             return call_underlay(request)
         else:
@@ -123,7 +121,7 @@ class ResourceOverlay(Resource, object):
     """
 
     def __init__(self, basis):
-        super(ResourceOverlay, self).__init__()
+        super().__init__()
         self.basis = basis
 
     def getChild(self, path, request):
@@ -197,7 +195,7 @@ class WebApplicationService(StreamServerEndpointService):
         self.site.requestFactory = CleanPathRequest
         # `endpoint` is set in `privilegedStartService`, at this point the
         # `endpoint` is None.
-        super(WebApplicationService, self).__init__(None, self.site)
+        super().__init__(None, self.site)
         self.websocket = WebSocketFactory(listener)
         self.threadpool = ThreadPoolLimiter(
             reactor.threadpoolForDatabase, concurrency.webapp
@@ -319,14 +317,14 @@ class WebApplicationService(StreamServerEndpointService):
         self.endpoint = self._makeEndpoint()
 
         # Start the service now that the endpoint has been created.
-        super(WebApplicationService, self).privilegedStartService()
+        super().privilegedStartService()
 
     @asynchronous(timeout=30)
     def stopService(self):
         def _cleanup(_):
             self.starting = False
 
-        d = super(WebApplicationService, self).stopService()
+        d = super().stopService()
         d.addCallback(lambda _: self.websocket.stopFactory())
         d.addCallback(_cleanup)
         return d
diff --git a/src/maasserver/websockets/base.py b/src/maasserver/websockets/base.py
index f7b0cc6..ef842e6 100644
--- a/src/maasserver/websockets/base.py
+++ b/src/maasserver/websockets/base.py
@@ -122,9 +122,7 @@ class HandlerMetaclass(type):
 
     def __new__(cls, name, bases, attrs):
         # Construct the class with the _meta field.
-        new_class = super(HandlerMetaclass, cls).__new__(
-            cls, name, bases, attrs
-        )
+        new_class = super().__new__(cls, name, bases, attrs)
         new_class._meta = HandlerOptions(getattr(new_class, "Meta", None))
 
         # Setup the handlers name based on the naming of the class.
diff --git a/src/maasserver/websockets/handlers/device.py b/src/maasserver/websockets/handlers/device.py
index 0901eee..c94fba1 100644
--- a/src/maasserver/websockets/handlers/device.py
+++ b/src/maasserver/websockets/handlers/device.py
@@ -257,7 +257,7 @@ class DeviceHandler(NodeHandler):
             for key, value in new_params.items()
             if value is not None
         }
-        return super(DeviceHandler, self).preprocess_form(action, new_params)
+        return super().preprocess_form(action, new_params)
 
     def _configure_interface(self, interface, params):
         """Configure the interface based on the selection."""
@@ -299,7 +299,7 @@ class DeviceHandler(NodeHandler):
 
         # Create the object with the form and then create all of the interfaces
         # based on the users choices.
-        data = super(DeviceHandler, self).create(params)
+        data = super().create(params)
         device_obj = Device.objects.get(system_id=data["system_id"])
         interfaces = list(device_obj.interface_set.all())
 
diff --git a/src/maasserver/websockets/handlers/discovery.py b/src/maasserver/websockets/handlers/discovery.py
index 89a09f4..0a78b15 100644
--- a/src/maasserver/websockets/handlers/discovery.py
+++ b/src/maasserver/websockets/handlers/discovery.py
@@ -38,7 +38,7 @@ class DiscoveryHandler(ViewModelHandler):
         """
         if "start" in params:
             params["start"] = datetime.fromtimestamp(float(params["start"]))
-        return super(DiscoveryHandler, self).list(params)
+        return super().list(params)
 
     def dehydrate(self, obj, data, for_list=False):
         """Add extra fields to `data`."""
diff --git a/src/maasserver/websockets/handlers/event.py b/src/maasserver/websockets/handlers/event.py
index c8fd197..4cbc815 100644
--- a/src/maasserver/websockets/handlers/event.py
+++ b/src/maasserver/websockets/handlers/event.py
@@ -30,7 +30,7 @@ class EventHandler(TimestampedModelHandler):
         listen_channels = ["event"]
 
     def __init__(self, *args, **kwargs):
-        super(EventHandler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if "node_ids" not in self.cache:
             self.cache["node_ids"] = []
 
diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index bb18a58..eb6fb07 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -90,7 +90,7 @@ class PodHandler(TimestampedModelHandler):
             for key, value in new_params.items()
             if value is not None
         }
-        return super(PodHandler, self).preprocess_form(action, new_params)
+        return super().preprocess_form(action, new_params)
 
     def dehydrate(self, obj, data, for_list=False):
         """Add extra fields to `data`."""
diff --git a/src/maasserver/websockets/handlers/sshkey.py b/src/maasserver/websockets/handlers/sshkey.py
index 741189f..038159b 100644
--- a/src/maasserver/websockets/handlers/sshkey.py
+++ b/src/maasserver/websockets/handlers/sshkey.py
@@ -37,9 +37,7 @@ class SSHKeyHandler(TimestampedModelHandler):
 
     def get_object(self, params, permission=None):
         """Only allow getting keys owned by the user."""
-        obj = super(SSHKeyHandler, self).get_object(
-            params, permission=permission
-        )
+        obj = super().get_object(params, permission=permission)
         if obj.user != self.user:
             raise HandlerDoesNotExistError(params[self._meta.pk])
         else:
diff --git a/src/maasserver/websockets/handlers/sslkey.py b/src/maasserver/websockets/handlers/sslkey.py
index 9152c57..95d0bdc 100644
--- a/src/maasserver/websockets/handlers/sslkey.py
+++ b/src/maasserver/websockets/handlers/sslkey.py
@@ -32,9 +32,7 @@ class SSLKeyHandler(TimestampedModelHandler):
 
     def get_object(self, params, permission=None):
         """Only allow getting keys owned by the user."""
-        obj = super(SSLKeyHandler, self).get_object(
-            params, permission=permission
-        )
+        obj = super().get_object(params, permission=permission)
         if obj.user != self.user:
             raise HandlerDoesNotExistError(params[self._meta.pk])
         else:
diff --git a/src/maasserver/websockets/handlers/staticroute.py b/src/maasserver/websockets/handlers/staticroute.py
index 307a3f6..23fd22f 100644
--- a/src/maasserver/websockets/handlers/staticroute.py
+++ b/src/maasserver/websockets/handlers/staticroute.py
@@ -27,16 +27,16 @@ class StaticRouteHandler(TimestampedModelHandler):
         """Create a static route."""
         if not self.user.is_superuser:
             raise PermissionDenied()
-        return super(StaticRouteHandler, self).create(params)
+        return super().create(params)
 
     def update(self, params):
         """Update this static route."""
         if not self.user.is_superuser:
             raise PermissionDenied()
-        return super(StaticRouteHandler, self).update(params)
+        return super().update(params)
 
     def delete(self, params):
         """Delete this static route."""
         if not self.user.is_superuser:
             raise PermissionDenied()
-        return super(StaticRouteHandler, self).delete(params)
+        return super().delete(params)
diff --git a/src/maasserver/websockets/handlers/switch.py b/src/maasserver/websockets/handlers/switch.py
index 56e6ba2..b05cb29 100644
--- a/src/maasserver/websockets/handlers/switch.py
+++ b/src/maasserver/websockets/handlers/switch.py
@@ -43,7 +43,7 @@ class SwitchHandler(NodeHandler):
 
     def get_object(self, params):
         """Get object by using the `pk` in `params`."""
-        obj = super(SwitchHandler, self).get_object(params)
+        obj = super().get_object(params)
         if self.user.is_superuser or obj.owner == self.user:
             return obj
         raise HandlerDoesNotExistError(params[self._meta.pk])
diff --git a/src/maasserver/websockets/handlers/tests/test_bootresource.py b/src/maasserver/websockets/handlers/tests/test_bootresource.py
index b1659fa..ced9594 100644
--- a/src/maasserver/websockets/handlers/tests/test_bootresource.py
+++ b/src/maasserver/websockets/handlers/tests/test_bootresource.py
@@ -58,7 +58,7 @@ class PatchOSInfoMixin:
 
 class TestBootResourcePoll(MAASServerTestCase, PatchOSInfoMixin):
     def setUp(self):
-        super(TestBootResourcePoll, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
@@ -837,7 +837,7 @@ class TestBootResourceSaveUbuntu(
     MAASTransactionServerTestCase, PatchOSInfoMixin
 ):
     def setUp(self):
-        super(TestBootResourceSaveUbuntu, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
@@ -1044,7 +1044,7 @@ class TestBootResourceSaveUbuntuCore(MAASTransactionServerTestCase):
 
 class TestBootResourceSaveOther(MAASTransactionServerTestCase):
     def setUp(self):
-        super(TestBootResourceSaveOther, self).setUp()
+        super().setUp()
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
diff --git a/src/maasserver/websockets/handlers/timestampedmodel.py b/src/maasserver/websockets/handlers/timestampedmodel.py
index f0ac07d..f7132c2 100644
--- a/src/maasserver/websockets/handlers/timestampedmodel.py
+++ b/src/maasserver/websockets/handlers/timestampedmodel.py
@@ -13,7 +13,7 @@ class TimestampedModelHandler(Handler):
         abstract = True
 
     def __new__(cls, *args, **kwargs):
-        cls = super(TimestampedModelHandler, cls).__new__(cls)
+        cls = super().__new__(cls)
         if cls._meta.non_changeable is None:
             cls._meta.non_changeable = []
         for field in ["created", "updated"]:
diff --git a/src/maasserver/websockets/handlers/token.py b/src/maasserver/websockets/handlers/token.py
index 970b147..fc003b8 100644
--- a/src/maasserver/websockets/handlers/token.py
+++ b/src/maasserver/websockets/handlers/token.py
@@ -27,9 +27,7 @@ class TokenHandler(Handler):
 
     def get_object(self, params, permission=None):
         """Only allow getting keys owned by the user."""
-        obj = super(TokenHandler, self).get_object(
-            params, permission=permission
-        )
+        obj = super().get_object(params, permission=permission)
         if obj.user != self.user:
             raise HandlerDoesNotExistError(params[self._meta.pk])
         else:
diff --git a/src/maasserver/websockets/handlers/user.py b/src/maasserver/websockets/handlers/user.py
index 97f14fd..269d334 100644
--- a/src/maasserver/websockets/handlers/user.py
+++ b/src/maasserver/websockets/handlers/user.py
@@ -67,7 +67,7 @@ class UserHandler(Handler):
 
     def get_queryset(self, for_list=False):
         """Return `QuerySet` for users only viewable by `user`."""
-        users = super(UserHandler, self).get_queryset(for_list=for_list)
+        users = super().get_queryset(for_list=for_list)
         if self.user.is_superuser:
             # Super users can view all users, except for the built-in users
             return users.exclude(username__in=SYSTEM_USERS)
diff --git a/src/maasserver/websockets/handlers/vlan.py b/src/maasserver/websockets/handlers/vlan.py
index 3269325..0e75a12 100644
--- a/src/maasserver/websockets/handlers/vlan.py
+++ b/src/maasserver/websockets/handlers/vlan.py
@@ -87,7 +87,7 @@ class VLANHandler(TimestampedModelHandler):
 
             return create_vlan_form
         else:
-            return super(VLANHandler, self).get_form_class(action)
+            return super().get_form_class(action)
 
     def delete(self, parameters):
         """Delete this VLAN."""
@@ -98,7 +98,7 @@ class VLANHandler(TimestampedModelHandler):
 
     def update(self, parameters):
         """Delete this VLAN."""
-        return super(VLANHandler, self).update(parameters)
+        return super().update(parameters)
 
     def _configure_iprange_and_gateway(self, parameters):
         if "subnet" in parameters and parameters["subnet"] is not None:
diff --git a/src/maasserver/websockets/tests/test_websockets.py b/src/maasserver/websockets/tests/test_websockets.py
index 08f89f7..b627209 100644
--- a/src/maasserver/websockets/tests/test_websockets.py
+++ b/src/maasserver/websockets/tests/test_websockets.py
@@ -357,7 +357,7 @@ class WebSocketsProtocolTest(MAASTestCase):
     """
 
     def setUp(self):
-        super(WebSocketsProtocolTest, self).setUp()
+        super().setUp()
         self.receiver = SavingEchoReceiver()
         self.protocol = WebSocketsProtocol(self.receiver)
         self.factory = Factory.forProtocol(lambda: self.protocol)
@@ -451,7 +451,7 @@ class WebSocketsProtocolWrapperTest(MAASTestCase):
     """
 
     def setUp(self):
-        super(WebSocketsProtocolWrapperTest, self).setUp()
+        super().setUp()
         self.accumulatingProtocol = AccumulatingProtocol()
         self.protocol = WebSocketsProtocolWrapper(self.accumulatingProtocol)
         self.transport = StringTransportWithDisconnection()
@@ -542,7 +542,7 @@ class WebSocketsResourceTest(MAASTestCase):
     """
 
     def setUp(self):
-        super(WebSocketsResourceTest, self).setUp()
+        super().setUp()
 
         class SavingEchoFactory(Factory):
             def buildProtocol(oself, addr):
diff --git a/src/maasserver/workers.py b/src/maasserver/workers.py
index fc6cd5e..6b3b771 100644
--- a/src/maasserver/workers.py
+++ b/src/maasserver/workers.py
@@ -27,7 +27,7 @@ def set_max_workers_count(worker_count):
 
 class WorkerProcess(protocol.ProcessProtocol):
     def __init__(self, service, runningImport=False):
-        super(WorkerProcess, self).__init__()
+        super().__init__()
         self.service = service
         self.runningImport = runningImport
 
@@ -55,7 +55,7 @@ class WorkersService(service.Service, object):
     """
 
     def __init__(self, reactor, *, worker_count=None, worker_cmd=None):
-        super(WorkersService, self).__init__()
+        super().__init__()
         self.reactor = reactor
         self.stopping = False
         self.worker_count = worker_count
@@ -68,7 +68,7 @@ class WorkersService(service.Service, object):
 
     def startService(self):
         """Start the workers."""
-        super(WorkersService, self).startService()
+        super().startService()
         self.spawnWorkers()
 
     def stopService(self):
diff --git a/src/maastesting/crochet.py b/src/maastesting/crochet.py
index 40f1dc3..6746e98 100644
--- a/src/maastesting/crochet.py
+++ b/src/maastesting/crochet.py
@@ -19,7 +19,7 @@ class EventualResultCatchingMixin:
     """
 
     def setUp(self):
-        super(EventualResultCatchingMixin, self).setUp()
+        super().setUp()
         try:
             # Every EventualResult that crochet creates is registered into
             # this registry. We'll check it after the test has finished.
diff --git a/src/maastesting/djangoloader.py b/src/maastesting/djangoloader.py
index 035ad46..52b2b0d 100755
--- a/src/maastesting/djangoloader.py
+++ b/src/maastesting/djangoloader.py
@@ -26,7 +26,7 @@ class MAASDjangoTestRunner(NoseTestSuiteRunner):
                 if database["HOST"] == self.cluster.datadir:
                     self.cluster.createdb(database["NAME"])
             # Call-up to super-classes.
-            up = super(MAASDjangoTestRunner, self)
+            up = super()
             return up.setup_databases(*args, **kwargs)
         except Exception:
             # Clean-up the cluster now, or it'll be left running; django-nose
@@ -43,5 +43,5 @@ class MAASDjangoTestRunner(NoseTestSuiteRunner):
         the test databases, hence there is also tear-down code embedded in
         `setup_databases`.
         """
-        super(MAASDjangoTestRunner, self).teardown_databases(*args, **kwargs)
+        super().teardown_databases(*args, **kwargs)
         self.cluster.cleanUp()
diff --git a/src/maastesting/djangotestcase.py b/src/maastesting/djangotestcase.py
index b75ea79..97ce245 100644
--- a/src/maastesting/djangotestcase.py
+++ b/src/maastesting/djangotestcase.py
@@ -197,7 +197,7 @@ class DjangoTestCase(django.test.TestCase, MAASTestCase):
     legacy = True
 
     def _fixture_teardown(self):
-        super(DjangoTestCase, self)._fixture_teardown()
+        super()._fixture_teardown()
         # TODO blake_r: Fix so this is not disabled. Currently not
         # working with Django 1.8.
         # Don't let unfinished database activity get away with it.
@@ -232,7 +232,7 @@ class DjangoTransactionTestCase(django.test.TransactionTestCase, MAASTestCase):
     legacy = True
 
     def _fixture_teardown(self):
-        super(DjangoTransactionTestCase, self)._fixture_teardown()
+        super()._fixture_teardown()
         # TODO blake_r: Fix so this is not disabled. Currently not
         # working with Django 1.8.
         # Don't let unfinished database activity get away with it.
diff --git a/src/maastesting/doubles.py b/src/maastesting/doubles.py
index fbd3701..cb84e05 100644
--- a/src/maastesting/doubles.py
+++ b/src/maastesting/doubles.py
@@ -25,7 +25,7 @@ class StubContext:
     """
 
     def __init__(self):
-        super(StubContext, self).__init__()
+        super().__init__()
         self.entered = False
         self.exited = False
 
diff --git a/src/maastesting/fixtures.py b/src/maastesting/fixtures.py
index b311fb1..d1d00d8 100644
--- a/src/maastesting/fixtures.py
+++ b/src/maastesting/fixtures.py
@@ -42,12 +42,12 @@ class ImportErrorFixture(fixtures.Fixture):
     """
 
     def __init__(self, module_name, sub_name):
-        super(ImportErrorFixture, self).__init__()
+        super().__init__()
         self.module_name = module_name
         self.sub_name = sub_name
 
     def setUp(self):
-        super(ImportErrorFixture, self).setUp()
+        super().setUp()
 
         def mock_import(name, *import_args, **kwargs):
             if name == self.module_name:
@@ -75,12 +75,12 @@ class LoggerSilencerFixture(fixtures.Fixture):
     """
 
     def __init__(self, names, level=logging.ERROR):
-        super(LoggerSilencerFixture, self).__init__()
+        super().__init__()
         self.names = names
         self.level = level
 
     def setUp(self):
-        super(LoggerSilencerFixture, self).setUp()
+        super().setUp()
         for name in self.names:
             logger = logging.getLogger(name)
             self.addCleanup(logger.setLevel, logger.level)
@@ -91,7 +91,7 @@ class ProxiesDisabledFixture(fixtures.Fixture):
     """Disables all HTTP/HTTPS proxies set in the environment."""
 
     def setUp(self):
-        super(ProxiesDisabledFixture, self).setUp()
+        super().setUp()
         self.useFixture(EnvironmentVariable("http_proxy"))
         self.useFixture(EnvironmentVariable("https_proxy"))
 
@@ -100,7 +100,7 @@ class TempDirectory(fixtures.TempDir):
     """Create a temporary directory, ensuring Unicode paths."""
 
     def setUp(self):
-        super(TempDirectory, self).setUp()
+        super().setUp()
         if isinstance(self.path, bytes):
             encoding = sys.getfilesystemencoding()
             self.path = self.path.decode(encoding)
@@ -114,7 +114,7 @@ class TempWDFixture(TempDirectory):
 
     def setUp(self):
         cwd = os.getcwd()
-        super(TempWDFixture, self).setUp()
+        super().setUp()
         self.addCleanup(os.chdir, cwd)
         os.chdir(self.path)
 
@@ -148,7 +148,7 @@ class CaptureStandardIO(fixtures.Fixture):
     stderr = None
 
     def __init__(self, encoding="utf-8"):
-        super(CaptureStandardIO, self).__init__()
+        super().__init__()
         self.codec = codecs.lookup(encoding)
         self.encoding = encoding
         # Create new buffers.
@@ -157,7 +157,7 @@ class CaptureStandardIO(fixtures.Fixture):
         self._buf_err = BytesIO()
 
     def setUp(self):
-        super(CaptureStandardIO, self).setUp()
+        super().setUp()
         self.patcher = MonkeyPatcher()
         self.addCleanup(self.patcher.restore)
         # Patch sys.std* and self.std*. Use TextIOWrapper to provide an
@@ -254,7 +254,7 @@ class DetectLeakedFileDescriptors(fixtures.Fixture):
     """
 
     def setUp(self):
-        super(DetectLeakedFileDescriptors, self).setUp()
+        super().setUp()
         self.fdpath = "/proc/%d/fd" % os.getpid()
         self.addCleanup(self.check, os.listdir(self.fdpath))
 
diff --git a/src/maastesting/httpd.py b/src/maastesting/httpd.py
index 99c99c7..79aba61 100644
--- a/src/maastesting/httpd.py
+++ b/src/maastesting/httpd.py
@@ -144,7 +144,7 @@ class HTTPServerFixture(Fixture):
     """
 
     def __init__(self, host="localhost", port=0):
-        super(HTTPServerFixture, self).__init__()
+        super().__init__()
         self.server = ThreadingHTTPServer(
             (host, port), SilentHTTPRequestHandler
         )
@@ -154,6 +154,6 @@ class HTTPServerFixture(Fixture):
         return "http://%s:%d/" % self.server.server_address
 
     def setUp(self):
-        super(HTTPServerFixture, self).setUp()
+        super().setUp()
         threading.Thread(target=self.server.serve_forever).start()
         self.addCleanup(self.server.shutdown)
diff --git a/src/maastesting/matchers.py b/src/maastesting/matchers.py
index 7855fef..297535e 100644
--- a/src/maastesting/matchers.py
+++ b/src/maastesting/matchers.py
@@ -82,7 +82,7 @@ class Matches:
     """
 
     def __init__(self, matcher):
-        super(Matches, self).__init__()
+        super().__init__()
         self.matcher = matcher
 
     def __eq__(self, other):
@@ -110,7 +110,7 @@ class Provides(MatchesPredicate):
     """Match if the given interface is provided."""
 
     def __init__(self, iface):
-        super(Provides, self).__init__(
+        super().__init__(
             iface.providedBy, "%%r does not provide %s" % iface.getName()
         )
 
@@ -119,7 +119,7 @@ class HasAttribute(Matcher):
     """Match if the given attribute is available."""
 
     def __init__(self, attribute):
-        super(HasAttribute, self).__init__()
+        super().__init__()
         self.attribute = attribute
 
     def match(self, something):
@@ -332,7 +332,7 @@ class IsUnfiredDeferred(Matcher):
 
 class MatchesPartialCall(Matcher):
     def __init__(self, func, *args, **keywords):
-        super(MatchesPartialCall, self).__init__()
+        super().__init__()
         if len(keywords) > 0:
             self.expected = partial(func, *args, **keywords)
         else:
@@ -367,7 +367,7 @@ class DocTestMatches(matchers.DocTestMatches):
     DEFAULT_FLAGS = doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE
 
     def __init__(self, example, flags=DEFAULT_FLAGS):
-        super(DocTestMatches, self).__init__(example, flags)
+        super().__init__(example, flags)
 
 
 class FileContains(Matcher):
@@ -446,7 +446,7 @@ class TextEquals(Matcher):
     """
 
     def __init__(self, expected):
-        super(TextEquals, self).__init__()
+        super().__init__()
         self.expected = expected
 
     def match(self, observed):
@@ -488,7 +488,7 @@ class ContainedBy(Matcher):
     """Test if the matchee is in the given container."""
 
     def __init__(self, haystack):
-        super(ContainedBy, self).__init__()
+        super().__init__()
         self.haystack = haystack
 
     def __str__(self):
diff --git a/src/maastesting/noseplug.py b/src/maastesting/noseplug.py
index f002ef7..b1cd3ab 100644
--- a/src/maastesting/noseplug.py
+++ b/src/maastesting/noseplug.py
@@ -47,7 +47,7 @@ class Crochet(Plugin):
 
         :attention: This is part of the Nose plugin contract.
         """
-        super(Crochet, self).options(parser, env)
+        super().options(parser, env)
         parser.add_option(
             "--%s-no-setup" % self.name,
             dest=self.option_no_setup,
@@ -61,7 +61,7 @@ class Crochet(Plugin):
 
         :attention: This is part of the Nose plugin contract.
         """
-        super(Crochet, self).configure(options, conf)
+        super().configure(options, conf)
         if self.enabled:
             import crochet
 
@@ -79,7 +79,7 @@ class Crochet(Plugin):
                     if timeout is None:
                         raise AssertionError("A time-out must be specified.")
                     else:
-                        return super(EventualResult, self)._result(timeout)
+                        return super()._result(timeout)
 
             # Patch it back into crochet.
             crochet._eventloop.EventualResult = EventualResult
@@ -197,7 +197,7 @@ class Select(Plugin):
     log = logging.getLogger("nose.plugins.%s" % name)
 
     def __init__(self):
-        super(Select, self).__init__()
+        super().__init__()
         self.dirs = frozenset()
 
     def options(self, parser, env):
@@ -205,7 +205,7 @@ class Select(Plugin):
 
         :attention: This is part of the Nose plugin contract.
         """