From 67c2b27af7d7dc04c246be4f9a1d4cd29a3099ca Mon Sep 17 00:00:00 2001
From: Mads Jensen <mads.jensen@eficode.com>
Date: Thu, 25 Feb 2021 23:59:00 +0100
Subject: [PATCH] Stop inheriting from object. It's unneeded on Python 3+.
 (#8675)

---
 acme/acme/client.py                                         | 6 +++---
 acme/acme/crypto_util.py                                    | 6 +++---
 acme/acme/magic_typing.py                                   | 2 +-
 acme/acme/messages.py                                       | 2 +-
 acme/acme/mixins.py                                         | 2 +-
 acme/acme/standalone.py                                     | 2 +-
 certbot-apache/certbot_apache/_internal/dualparser.py       | 2 +-
 certbot-apache/certbot_apache/_internal/obj.py              | 2 +-
 certbot-apache/certbot_apache/_internal/parser.py           | 2 +-
 .../certbot_integration_tests/certbot_tests/context.py      | 2 +-
 certbot-ci/certbot_integration_tests/utils/acme_server.py   | 2 +-
 certbot-ci/certbot_integration_tests/utils/dns_server.py    | 2 +-
 .../certbot_compatibility_test/configurators/common.py      | 2 +-
 .../certbot_compatibility_test/validator.py                 | 2 +-
 .../certbot_dns_cloudflare/_internal/dns_cloudflare.py      | 2 +-
 .../certbot_dns_digitalocean/_internal/dns_digitalocean.py  | 2 +-
 .../certbot_dns_google/_internal/dns_google.py              | 2 +-
 certbot-dns-google/tests/dns_google_test.py                 | 2 +-
 .../certbot_dns_rfc2136/_internal/dns_rfc2136.py            | 2 +-
 certbot-nginx/certbot_nginx/_internal/nginxparser.py        | 4 ++--
 certbot-nginx/certbot_nginx/_internal/obj.py                | 2 +-
 certbot-nginx/certbot_nginx/_internal/parser.py             | 2 +-
 certbot-nginx/certbot_nginx/_internal/parser_obj.py         | 2 +-
 certbot/certbot/_internal/account.py                        | 2 +-
 certbot/certbot/_internal/auth_handler.py                   | 2 +-
 certbot/certbot/_internal/cli/cli_utils.py                  | 4 ++--
 certbot/certbot/_internal/cli/helpful.py                    | 2 +-
 certbot/certbot/_internal/client.py                         | 4 ++--
 certbot/certbot/_internal/configuration.py                  | 2 +-
 certbot/certbot/_internal/display/completer.py              | 2 +-
 certbot/certbot/_internal/error_handler.py                  | 2 +-
 certbot/certbot/_internal/lock.py                           | 4 ++--
 certbot/certbot/_internal/plugins/disco.py                  | 2 +-
 certbot/certbot/_internal/plugins/standalone.py             | 2 +-
 certbot/certbot/_internal/reporter.py                       | 2 +-
 certbot/certbot/display/util.py                             | 4 ++--
 certbot/certbot/ocsp.py                                     | 2 +-
 certbot/certbot/plugins/common.py                           | 6 +++---
 certbot/certbot/plugins/dns_common.py                       | 2 +-
 certbot/certbot/plugins/dns_common_lexicon.py               | 2 +-
 certbot/certbot/plugins/dns_test_common.py                  | 2 +-
 certbot/certbot/plugins/dns_test_common_lexicon.py          | 2 +-
 certbot/certbot/plugins/storage.py                          | 2 +-
 certbot/certbot/reverter.py                                 | 2 +-
 certbot/certbot/tests/util.py                               | 2 +-
 certbot/tests/plugins/dns_common_test.py                    | 2 +-
 tests/letstest/multitester.py                               | 2 +-
 47 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/acme/acme/client.py b/acme/acme/client.py
index c3f8c550f..33e515124 100644
--- a/acme/acme/client.py
+++ b/acme/acme/client.py
@@ -33,7 +33,7 @@ DEFAULT_NETWORK_TIMEOUT = 45
 DER_CONTENT_TYPE = 'application/pkix-cert'
 
 
-class ClientBase(object):
+class ClientBase:
     """ACME client base object.
 
     :ivar messages.Directory directory:
@@ -795,7 +795,7 @@ class ClientV2(ClientBase):
                 if 'rel' in l and 'url' in l and l['rel'] == relation_type]
 
 
-class BackwardsCompatibleClientV2(object):
+class BackwardsCompatibleClientV2:
     """ACME client wrapper that tends towards V2-style calls, but
     supports V1 servers.
 
@@ -938,7 +938,7 @@ class BackwardsCompatibleClientV2(object):
         return self.client.external_account_required()
 
 
-class ClientNetwork(object):
+class ClientNetwork:
     """Wrapper around requests that signs POSTs for authentication.
 
     Also adds user agent, and handles Content-Type.
diff --git a/acme/acme/crypto_util.py b/acme/acme/crypto_util.py
index 4b58db328..a14737053 100644
--- a/acme/acme/crypto_util.py
+++ b/acme/acme/crypto_util.py
@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
 _DEFAULT_SSL_METHOD = SSL.SSLv23_METHOD  # type: ignore
 
 
-class _DefaultCertSelection(object):
+class _DefaultCertSelection:
     def __init__(self, certs):
         self.certs = certs
 
@@ -36,7 +36,7 @@ class _DefaultCertSelection(object):
         return self.certs.get(server_name, None)
 
 
-class SSLSocket(object):  # pylint: disable=too-few-public-methods
+class SSLSocket:  # pylint: disable=too-few-public-methods
     """SSL wrapper for sockets.
 
     :ivar socket sock: Original wrapped socket.
@@ -93,7 +93,7 @@ class SSLSocket(object):  # pylint: disable=too-few-public-methods
             new_context.set_alpn_select_callback(self.alpn_selection)
         connection.set_context(new_context)
 
-    class FakeConnection(object):
+    class FakeConnection:
         """Fake OpenSSL.SSL.Connection."""
 
         # pylint: disable=missing-function-docstring
diff --git a/acme/acme/magic_typing.py b/acme/acme/magic_typing.py
index 388fc4a58..0e60d3203 100644
--- a/acme/acme/magic_typing.py
+++ b/acme/acme/magic_typing.py
@@ -2,7 +2,7 @@
 import sys
 
 
-class TypingClass(object):
+class TypingClass:
     """Ignore import errors by getting anything"""
     def __getattr__(self, name):
         return None
diff --git a/acme/acme/messages.py b/acme/acme/messages.py
index 61fd89dfd..0d73037ae 100644
--- a/acme/acme/messages.py
+++ b/acme/acme/messages.py
@@ -274,7 +274,7 @@ class ResourceBody(jose.JSONObjectWithFields):
     """ACME Resource Body."""
 
 
-class ExternalAccountBinding(object):
+class ExternalAccountBinding:
     """ACME External Account Binding"""
 
     @classmethod
diff --git a/acme/acme/mixins.py b/acme/acme/mixins.py
index 1cd050ccc..0e1e0977c 100644
--- a/acme/acme/mixins.py
+++ b/acme/acme/mixins.py
@@ -1,7 +1,7 @@
 """Useful mixins for Challenge and Resource objects"""
 
 
-class VersionedLEACMEMixin(object):
+class VersionedLEACMEMixin:
     """This mixin stores the version of Let's Encrypt's endpoint being used."""
     @property
     def le_acme_version(self):
diff --git a/acme/acme/standalone.py b/acme/acme/standalone.py
index 94397f0de..f5bc548b6 100644
--- a/acme/acme/standalone.py
+++ b/acme/acme/standalone.py
@@ -53,7 +53,7 @@ class ACMEServerMixin:
     allow_reuse_address = True
 
 
-class BaseDualNetworkedServers(object):
+class BaseDualNetworkedServers:
     """Base class for a pair of IPv6 and IPv4 servers that tries to do everything
        it's asked for both servers, but where failures in one server don't
        affect the other.
diff --git a/certbot-apache/certbot_apache/_internal/dualparser.py b/certbot-apache/certbot_apache/_internal/dualparser.py
index eef8f2a0e..1ba23e92f 100644
--- a/certbot-apache/certbot_apache/_internal/dualparser.py
+++ b/certbot-apache/certbot_apache/_internal/dualparser.py
@@ -4,7 +4,7 @@ from certbot_apache._internal import augeasparser
 from certbot_apache._internal import apacheparser
 
 
-class DualNodeBase(object):
+class DualNodeBase:
     """ Dual parser interface for in development testing. This is used as the
     base class for dual parser interface classes. This class handles runtime
     attribute value assertions."""
diff --git a/certbot-apache/certbot_apache/_internal/obj.py b/certbot-apache/certbot_apache/_internal/obj.py
index 3cd5f0ff2..e2fe48cf8 100644
--- a/certbot-apache/certbot_apache/_internal/obj.py
+++ b/certbot-apache/certbot_apache/_internal/obj.py
@@ -95,7 +95,7 @@ class Addr(common.Addr):
         return self.get_addr_obj(port)
 
 
-class VirtualHost(object):
+class VirtualHost:
     """Represents an Apache Virtualhost.
 
     :ivar str filep: file path of VH
diff --git a/certbot-apache/certbot_apache/_internal/parser.py b/certbot-apache/certbot_apache/_internal/parser.py
index 75be0833f..fdef167bc 100644
--- a/certbot-apache/certbot_apache/_internal/parser.py
+++ b/certbot-apache/certbot_apache/_internal/parser.py
@@ -16,7 +16,7 @@ from certbot_apache._internal import constants
 logger = logging.getLogger(__name__)
 
 
-class ApacheParser(object):
+class ApacheParser:
     """Class handles the fine details of parsing the Apache Configuration.
 
     .. todo:: Make parsing general... remove sites-available etc...
diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/context.py b/certbot-ci/certbot_integration_tests/certbot_tests/context.py
index b9854b402..b052e375d 100644
--- a/certbot-ci/certbot_integration_tests/certbot_tests/context.py
+++ b/certbot-ci/certbot_integration_tests/certbot_tests/context.py
@@ -7,7 +7,7 @@ import tempfile
 from certbot_integration_tests.utils import certbot_call
 
 
-class IntegrationTestsContext(object):
+class IntegrationTestsContext:
     """General fixture describing a certbot integration tests context"""
     def __init__(self, request):
         self.request = request
diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py
index bbbdd196b..846e2d071 100755
--- a/certbot-ci/certbot_integration_tests/utils/acme_server.py
+++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py
@@ -23,7 +23,7 @@ from certbot_integration_tests.utils import proxy
 from certbot_integration_tests.utils.constants import *
 
 
-class ACMEServer(object):
+class ACMEServer:
     """
     ACMEServer configures and handles the lifecycle of an ACME CA server and an HTTP reverse proxy
     instance, to allow parallel execution of integration tests against the unique http-01 port
diff --git a/certbot-ci/certbot_integration_tests/utils/dns_server.py b/certbot-ci/certbot_integration_tests/utils/dns_server.py
index 416f6567e..62a58275e 100644
--- a/certbot-ci/certbot_integration_tests/utils/dns_server.py
+++ b/certbot-ci/certbot_integration_tests/utils/dns_server.py
@@ -21,7 +21,7 @@ BIND_BIND_ADDRESS = ("127.0.0.1", 45953)
 BIND_TEST_QUERY = bytearray.fromhex("0011cb37000000010000000000000000010003")
 
 
-class DNSServer(object):
+class DNSServer:
     """
     DNSServer configures and handles the lifetime of an RFC2136-capable server.
     DNServer provides access to the dns_xdist parameter, listing the address and port
diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py b/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py
index 34aa9133f..bf768f8f8 100644
--- a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py
+++ b/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py
@@ -11,7 +11,7 @@ from certbot_compatibility_test import util
 logger = logging.getLogger(__name__)
 
 
-class Proxy(object):
+class Proxy:
     """A common base for compatibility test configurators"""
 
     @classmethod
diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py
index 9a082523a..226b8585b 100644
--- a/certbot-compatibility-test/certbot_compatibility_test/validator.py
+++ b/certbot-compatibility-test/certbot_compatibility_test/validator.py
@@ -10,7 +10,7 @@ from acme import errors as acme_errors
 logger = logging.getLogger(__name__)
 
 
-class Validator(object):
+class Validator:
     """Collection of functions to test a live webserver's configuration"""
 
     def certificate(self, cert, name, alt_host=None, port=443):
diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py b/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py
index 5978af85c..c896a6e3a 100644
--- a/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py
+++ b/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py
@@ -85,7 +85,7 @@ class Authenticator(dns_common.DNSAuthenticator):
         return _CloudflareClient(self.credentials.conf('email'), self.credentials.conf('api-key'))
 
 
-class _CloudflareClient(object):
+class _CloudflareClient:
     """
     Encapsulates all communication with the Cloudflare API.
     """
diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/dns_digitalocean.py b/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/dns_digitalocean.py
index e0c9561a2..5893df9c2 100644
--- a/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/dns_digitalocean.py
+++ b/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/dns_digitalocean.py
@@ -54,7 +54,7 @@ class Authenticator(dns_common.DNSAuthenticator):
         return _DigitalOceanClient(self.credentials.conf('token'))
 
 
-class _DigitalOceanClient(object):
+class _DigitalOceanClient:
     """
     Encapsulates all communication with the DigitalOcean API.
     """
diff --git a/certbot-dns-google/certbot_dns_google/_internal/dns_google.py b/certbot-dns-google/certbot_dns_google/_internal/dns_google.py
index 4b0d91463..363c5e079 100644
--- a/certbot-dns-google/certbot_dns_google/_internal/dns_google.py
+++ b/certbot-dns-google/certbot_dns_google/_internal/dns_google.py
@@ -76,7 +76,7 @@ class Authenticator(dns_common.DNSAuthenticator):
         return _GoogleClient(self.conf('credentials'))
 
 
-class _GoogleClient(object):
+class _GoogleClient:
     """
     Encapsulates all communication with the Google Cloud DNS API.
     """
diff --git a/certbot-dns-google/tests/dns_google_test.py b/certbot-dns-google/tests/dns_google_test.py
index 396a6c8bd..7de5f1d67 100644
--- a/certbot-dns-google/tests/dns_google_test.py
+++ b/certbot-dns-google/tests/dns_google_test.py
@@ -401,7 +401,7 @@ class GoogleClientTest(unittest.TestCase):
             self.assertRaises(ServerNotFoundError, _GoogleClient.get_project_id)
 
 
-class DummyResponse(object):
+class DummyResponse:
     """
     Dummy object to create a fake HTTPResponse (the actual one requires a socket and we only
      need the status attribute)
diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/dns_rfc2136.py b/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/dns_rfc2136.py
index 57e9506f2..adebdd963 100644
--- a/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/dns_rfc2136.py
+++ b/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/dns_rfc2136.py
@@ -88,7 +88,7 @@ class Authenticator(dns_common.DNSAuthenticator):
                                                   dns.tsig.HMAC_MD5))
 
 
-class _RFC2136Client(object):
+class _RFC2136Client:
     """
     Encapsulates all communication with the target DNS server.
     """
diff --git a/certbot-nginx/certbot_nginx/_internal/nginxparser.py b/certbot-nginx/certbot_nginx/_internal/nginxparser.py
index f043b0e4d..a51302fae 100644
--- a/certbot-nginx/certbot_nginx/_internal/nginxparser.py
+++ b/certbot-nginx/certbot_nginx/_internal/nginxparser.py
@@ -19,7 +19,7 @@ from acme.magic_typing import IO, Any # pylint: disable=unused-import
 
 logger = logging.getLogger(__name__)
 
-class RawNginxParser(object):
+class RawNginxParser:
     # pylint: disable=pointless-statement
     """A class that parses nginx configuration with pyparsing."""
 
@@ -69,7 +69,7 @@ class RawNginxParser(object):
         """Returns the parsed tree as a list."""
         return self.parse().asList()
 
-class RawNginxDumper(object):
+class RawNginxDumper:
     """A class that dumps nginx configuration from the provided tree."""
     def __init__(self, blocks):
         self.blocks = blocks
diff --git a/certbot-nginx/certbot_nginx/_internal/obj.py b/certbot-nginx/certbot_nginx/_internal/obj.py
index 2dd02f180..1511cba6d 100644
--- a/certbot-nginx/certbot_nginx/_internal/obj.py
+++ b/certbot-nginx/certbot_nginx/_internal/obj.py
@@ -143,7 +143,7 @@ class Addr(common.Addr):
         return False
 
 
-class VirtualHost(object):
+class VirtualHost:
     """Represents an Nginx Virtualhost.
 
     :ivar str filep: file path of VH
diff --git a/certbot-nginx/certbot_nginx/_internal/parser.py b/certbot-nginx/certbot_nginx/_internal/parser.py
index fe5d7bb31..17a8c652a 100644
--- a/certbot-nginx/certbot_nginx/_internal/parser.py
+++ b/certbot-nginx/certbot_nginx/_internal/parser.py
@@ -21,7 +21,7 @@ from certbot_nginx._internal import obj
 logger = logging.getLogger(__name__)
 
 
-class NginxParser(object):
+class NginxParser:
     """Class handles the fine details of parsing the Nginx Configuration.
 
     :ivar str root: Normalized absolute path to the server root
diff --git a/certbot-nginx/certbot_nginx/_internal/parser_obj.py b/certbot-nginx/certbot_nginx/_internal/parser_obj.py
index d616a1a99..e55d48dc4 100644
--- a/certbot-nginx/certbot_nginx/_internal/parser_obj.py
+++ b/certbot-nginx/certbot_nginx/_internal/parser_obj.py
@@ -13,7 +13,7 @@ COMMENT = " managed by Certbot"
 COMMENT_BLOCK = ["#", COMMENT]
 
 
-class Parsable(object):
+class Parsable:
     """ Abstract base class for "Parsable" objects whose underlying representation
     is a tree of lists.
 
diff --git a/certbot/certbot/_internal/account.py b/certbot/certbot/_internal/account.py
index dbe111fbc..b2d50297e 100644
--- a/certbot/certbot/_internal/account.py
+++ b/certbot/certbot/_internal/account.py
@@ -24,7 +24,7 @@ from certbot.compat import filesystem
 logger = logging.getLogger(__name__)
 
 
-class Account(object):
+class Account:
     """ACME protocol registration.
 
     :ivar .RegistrationResource regr: Registration Resource
diff --git a/certbot/certbot/_internal/auth_handler.py b/certbot/certbot/_internal/auth_handler.py
index 7ea2a1de8..17bf75225 100644
--- a/certbot/certbot/_internal/auth_handler.py
+++ b/certbot/certbot/_internal/auth_handler.py
@@ -19,7 +19,7 @@ from certbot._internal import error_handler
 logger = logging.getLogger(__name__)
 
 
-class AuthHandler(object):
+class AuthHandler:
     """ACME Authorization Handler for a client.
 
     :ivar auth: Authenticator capable of solving
diff --git a/certbot/certbot/_internal/cli/cli_utils.py b/certbot/certbot/_internal/cli/cli_utils.py
index a0ddce38f..5bdbbe02c 100644
--- a/certbot/certbot/_internal/cli/cli_utils.py
+++ b/certbot/certbot/_internal/cli/cli_utils.py
@@ -12,7 +12,7 @@ from certbot.compat import os
 from certbot._internal import constants
 
 
-class _Default(object):
+class _Default:
     """A class to use as a default to detect if a value is set by a user"""
 
     def __bool__(self):
@@ -66,7 +66,7 @@ def config_help(name, hidden=False):
     return field.__doc__
 
 
-class HelpfulArgumentGroup(object):
+class HelpfulArgumentGroup:
     """Emulates an argparse group for use with HelpfulArgumentParser.
 
     This class is used in the add_group method of HelpfulArgumentParser.
diff --git a/certbot/certbot/_internal/cli/helpful.py b/certbot/certbot/_internal/cli/helpful.py
index 80afe5db4..5eaec978b 100644
--- a/certbot/certbot/_internal/cli/helpful.py
+++ b/certbot/certbot/_internal/cli/helpful.py
@@ -41,7 +41,7 @@ from certbot._internal.cli import (
 )
 
 
-class HelpfulArgumentParser(object):
+class HelpfulArgumentParser:
     """Argparse Wrapper.
 
     This class wraps argparse, adding the ability to make --help less
diff --git a/certbot/certbot/_internal/client.py b/certbot/certbot/_internal/client.py
index 5dc62580e..f2fc06937 100644
--- a/certbot/certbot/_internal/client.py
+++ b/certbot/certbot/_internal/client.py
@@ -93,7 +93,7 @@ def ua_flags(config):
         flags.append("hook")
     return " ".join(flags)
 
-class DummyConfig(object):
+class DummyConfig:
     "Shim for computing a sample user agent."
     def __init__(self):
         self.authenticator = "XXX"
@@ -227,7 +227,7 @@ def perform_registration(acme, config, tos_cb):
         raise
 
 
-class Client(object):
+class Client:
     """Certbot's client.
 
     :ivar .IConfig config: Client configuration.
diff --git a/certbot/certbot/_internal/configuration.py b/certbot/certbot/_internal/configuration.py
index 1b5cf5da7..aee0022b8 100644
--- a/certbot/certbot/_internal/configuration.py
+++ b/certbot/certbot/_internal/configuration.py
@@ -13,7 +13,7 @@ from certbot.compat import os
 
 
 @zope.interface.implementer(interfaces.IConfig)
-class NamespaceConfig(object):
+class NamespaceConfig:
     """Configuration wrapper around :class:`argparse.Namespace`.
 
     For more documentation, including available attributes, please see
diff --git a/certbot/certbot/_internal/display/completer.py b/certbot/certbot/_internal/display/completer.py
index 03719862b..a6c984195 100644
--- a/certbot/certbot/_internal/display/completer.py
+++ b/certbot/certbot/_internal/display/completer.py
@@ -8,7 +8,7 @@ except ImportError:
     import certbot._internal.display.dummy_readline as readline  # type: ignore
 
 
-class Completer(object):
+class Completer:
     """Provides Tab completion when prompting users for a path.
 
     This class is meant to be used with readline to provide Tab
diff --git a/certbot/certbot/_internal/error_handler.py b/certbot/certbot/_internal/error_handler.py
index 60fb287a6..05af9d837 100644
--- a/certbot/certbot/_internal/error_handler.py
+++ b/certbot/certbot/_internal/error_handler.py
@@ -45,7 +45,7 @@ else:
     _SIGNALS = []
 
 
-class ErrorHandler(object):
+class ErrorHandler:
     """Context manager for running code that must be cleaned up on failure.
 
     The context manager allows you to register functions that will be called
diff --git a/certbot/certbot/_internal/lock.py b/certbot/certbot/_internal/lock.py
index aa0b80eaa..32142fe44 100644
--- a/certbot/certbot/_internal/lock.py
+++ b/certbot/certbot/_internal/lock.py
@@ -38,7 +38,7 @@ def lock_dir(dir_path):
     return LockFile(os.path.join(dir_path, '.certbot.lock'))
 
 
-class LockFile(object):
+class LockFile:
     """
     Platform independent file lock system.
     LockFile accepts a parameter, the path to a file acting as a lock. Once the LockFile,
@@ -97,7 +97,7 @@ class LockFile(object):
         return self._lock_mechanism.is_locked()
 
 
-class _BaseLockMechanism(object):
+class _BaseLockMechanism:
     def __init__(self, path):
         # type: (str) -> None
         """
diff --git a/certbot/certbot/_internal/plugins/disco.py b/certbot/certbot/_internal/plugins/disco.py
index d19fdd3ef..8adf6d4d2 100644
--- a/certbot/certbot/_internal/plugins/disco.py
+++ b/certbot/certbot/_internal/plugins/disco.py
@@ -39,7 +39,7 @@ PREFIX_FREE_DISTRIBUTIONS = [
 """Distributions for which prefix will be omitted."""
 
 
-class PluginEntryPoint(object):
+class PluginEntryPoint:
     """Plugin entry point."""
 
     # this object is mutable, don't allow it to be hashed!
diff --git a/certbot/certbot/_internal/plugins/standalone.py b/certbot/certbot/_internal/plugins/standalone.py
index 60c9558cb..d5d9fd2ec 100644
--- a/certbot/certbot/_internal/plugins/standalone.py
+++ b/certbot/certbot/_internal/plugins/standalone.py
@@ -28,7 +28,7 @@ if TYPE_CHECKING:
         Set[achallenges.KeyAuthorizationAnnotatedChallenge]
     ]
 
-class ServerManager(object):
+class ServerManager:
     """Standalone servers manager.
 
     Manager for `ACMEServer` and `ACMETLSServer` instances.
diff --git a/certbot/certbot/_internal/reporter.py b/certbot/certbot/_internal/reporter.py
index 64c0fbd6d..f43f0e7af 100644
--- a/certbot/certbot/_internal/reporter.py
+++ b/certbot/certbot/_internal/reporter.py
@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 
 @zope.interface.implementer(interfaces.IReporter)
-class Reporter(object):
+class Reporter:
     """Collects and displays information to the user.
 
     :ivar `queue.PriorityQueue` messages: Messages to be displayed to
diff --git a/certbot/certbot/display/util.py b/certbot/certbot/display/util.py
index 9da981892..f26ec468f 100644
--- a/certbot/certbot/display/util.py
+++ b/certbot/certbot/display/util.py
@@ -111,7 +111,7 @@ def notify(msg):
 
 
 @zope.interface.implementer(interfaces.IDisplay)
-class FileDisplay(object):
+class FileDisplay:
     """File-based display."""
     # see https://github.com/certbot/certbot/issues/3915
 
@@ -478,7 +478,7 @@ def assert_valid_call(prompt, default, cli_flag, force_interactive):
 
 
 @zope.interface.implementer(interfaces.IDisplay)
-class NoninteractiveDisplay(object):
+class NoninteractiveDisplay:
     """An iDisplay implementation that never asks for interactive user input"""
 
     def __init__(self, outfile, *unused_args, **unused_kwargs):
diff --git a/certbot/certbot/ocsp.py b/certbot/certbot/ocsp.py
index b63338e2e..dcbf0381a 100644
--- a/certbot/certbot/ocsp.py
+++ b/certbot/certbot/ocsp.py
@@ -36,7 +36,7 @@ except (ImportError, AttributeError):  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
-class RevocationChecker(object):
+class RevocationChecker:
     """This class figures out OCSP checking on this system, and performs it."""
 
     def __init__(self, enforce_openssl_binary_usage=False):
diff --git a/certbot/certbot/plugins/common.py b/certbot/certbot/plugins/common.py
index d3fb5b7dc..489c75a3d 100644
--- a/certbot/certbot/plugins/common.py
+++ b/certbot/certbot/plugins/common.py
@@ -40,7 +40,7 @@ hostname_regex = re.compile(
 
 
 @zope.interface.implementer(interfaces.IPlugin)
-class Plugin(object):
+class Plugin:
     """Generic plugin."""
     # provider is not inherited, subclasses must define it on their own
     # @zope.interface.provider(interfaces.IPluginFactory)
@@ -201,7 +201,7 @@ class Installer(Plugin):
             constants.ALL_SSL_DHPARAMS_HASHES)
 
 
-class Addr(object):
+class Addr:
     r"""Represents an virtual host address.
 
     :param str addr: addr part of vhost address
@@ -299,7 +299,7 @@ class Addr(object):
         return result
 
 
-class ChallengePerformer(object):
+class ChallengePerformer:
     """Abstract base for challenge performers.
 
     :ivar configurator: Authenticator and installer plugin
diff --git a/certbot/certbot/plugins/dns_common.py b/certbot/certbot/plugins/dns_common.py
index 245b7dc05..5c0fbcba9 100644
--- a/certbot/certbot/plugins/dns_common.py
+++ b/certbot/certbot/plugins/dns_common.py
@@ -233,7 +233,7 @@ class DNSAuthenticator(common.Plugin):
         raise errors.PluginError('{0} required to proceed.'.format(label))
 
 
-class CredentialsConfiguration(object):
+class CredentialsConfiguration:
     """Represents a user-supplied filed which stores API credentials."""
 
     def __init__(self, filename, mapper=lambda x: x):
diff --git a/certbot/certbot/plugins/dns_common_lexicon.py b/certbot/certbot/plugins/dns_common_lexicon.py
index c3d80ca29..a29509b79 100644
--- a/certbot/certbot/plugins/dns_common_lexicon.py
+++ b/certbot/certbot/plugins/dns_common_lexicon.py
@@ -23,7 +23,7 @@ except ImportError:
 logger = logging.getLogger(__name__)
 
 
-class LexiconClient(object):
+class LexiconClient:
     """
     Encapsulates all communication with a DNS provider via Lexicon.
     """
diff --git a/certbot/certbot/plugins/dns_test_common.py b/certbot/certbot/plugins/dns_test_common.py
index a3a26a7a1..1affcae4e 100644
--- a/certbot/certbot/plugins/dns_test_common.py
+++ b/certbot/certbot/plugins/dns_test_common.py
@@ -17,7 +17,7 @@ DOMAIN = 'example.com'
 KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
 
 
-class BaseAuthenticatorTest(object):
+class BaseAuthenticatorTest:
     """
     A base test class to reduce duplication between test code for DNS Authenticator Plugins.
 
diff --git a/certbot/certbot/plugins/dns_test_common_lexicon.py b/certbot/certbot/plugins/dns_test_common_lexicon.py
index 1bef06042..adeb1a268 100644
--- a/certbot/certbot/plugins/dns_test_common_lexicon.py
+++ b/certbot/certbot/plugins/dns_test_common_lexicon.py
@@ -34,7 +34,7 @@ class BaseLexiconAuthenticatorTest(dns_test_common.BaseAuthenticatorTest):
         self.assertEqual(expected, self.mock_client.mock_calls)
 
 
-class BaseLexiconClientTest(object):
+class BaseLexiconClientTest:
     DOMAIN_NOT_FOUND = Exception('No domain found')
     GENERIC_ERROR = RequestException
     LOGIN_ERROR = HTTPError('400 Client Error: ...')
diff --git a/certbot/certbot/plugins/storage.py b/certbot/certbot/plugins/storage.py
index f3ed14dce..abef534f9 100644
--- a/certbot/certbot/plugins/storage.py
+++ b/certbot/certbot/plugins/storage.py
@@ -11,7 +11,7 @@ from certbot.compat import os
 logger = logging.getLogger(__name__)
 
 
-class PluginStorage(object):
+class PluginStorage:
     """Class implementing storage functionality for plugins"""
 
     def __init__(self, config, classkey):
diff --git a/certbot/certbot/reverter.py b/certbot/certbot/reverter.py
index be9d78a11..363215dd0 100644
--- a/certbot/certbot/reverter.py
+++ b/certbot/certbot/reverter.py
@@ -17,7 +17,7 @@ from certbot.compat import os
 logger = logging.getLogger(__name__)
 
 
-class Reverter(object):
+class Reverter:
     """Reverter Class - save and revert configuration checkpoints.
 
     This class can be used by the plugins, especially Installers, to
diff --git a/certbot/certbot/tests/util.py b/certbot/certbot/tests/util.py
index 558bfbed3..78236fa06 100644
--- a/certbot/certbot/tests/util.py
+++ b/certbot/certbot/tests/util.py
@@ -185,7 +185,7 @@ def patch_get_utility_with_stdout(target='zope.component.getUtility',
     return mock.patch(target, new=freezable_mock)
 
 
-class FreezableMock(object):
+class FreezableMock:
     """Mock object with the ability to freeze attributes.
 
     This class works like a regular mock.MagicMock object, except
diff --git a/certbot/tests/plugins/dns_common_test.py b/certbot/tests/plugins/dns_common_test.py
index 993f3b461..31761e986 100644
--- a/certbot/tests/plugins/dns_common_test.py
+++ b/certbot/tests/plugins/dns_common_test.py
@@ -29,7 +29,7 @@ class DNSAuthenticatorTest(test_util.TempDirTestCase, dns_test_common.BaseAuthen
         def more_info(self):  # pylint: disable=missing-docstring,no-self-use
             return 'A fake authenticator for testing.'
 
-    class _FakeConfig(object):
+    class _FakeConfig:
         fake_propagation_seconds = 0
         fake_config_key = 1
         fake_other_key = None
diff --git a/tests/letstest/multitester.py b/tests/letstest/multitester.py
index 83a92e6dc..75dd06ad6 100644
--- a/tests/letstest/multitester.py
+++ b/tests/letstest/multitester.py
@@ -95,7 +95,7 @@ SECURITY_GROUP_NAME = 'certbot-security-group'
 SENTINEL = None #queue kill signal
 SUBNET_NAME = 'certbot-subnet'
 
-class Status(object):
+class Status:
     """Possible statuses of client tests."""
     PASS = 'pass'
     FAIL = 'fail'