use newer super() variant

Since this extension requires at least Python 3.7, the implementation
can now use the newer version of `super()` (instead of requiring the
class to be explicitly provided).

Signed-off-by: James Knight <[email protected]>

Author: jdknight

sphinxcontrib/confluencebuilder/builder.py

@@ -57,10 +57,10 @@ def __init__(self, app, env=None):
         # assigned.
         if sphinx_version_info >= (5, 1):
             # pylint: disable=too-many-function-args
-            super(ConfluenceBuilder, self).__init__(app, env)
+            super().__init__(app, env)
             # pylint: enable=too-many-function-args
         else:
-            super(ConfluenceBuilder, self).__init__(app)
+            super().__init__(app)
 
         self.cache_doctrees = {}
         self.cloud = False

sphinxcontrib/confluencebuilder/exceptions.py

@@ -11,7 +11,7 @@ class ConfluenceError(SphinxError):
 
 class ConfluenceAuthenticationFailedUrlError(ConfluenceError):
     def __init__(self):
-        super(ConfluenceAuthenticationFailedUrlError, self).__init__('''
+        super().__init__('''
 ---
 Unable to authenticate with Confluence
 
@@ -25,7 +25,7 @@ def __init__(self):
 
 class ConfluenceBadApiError(ConfluenceError):
     def __init__(self, code, details):
-        super(ConfluenceBadApiError, self).__init__('''
+        super().__init__('''
 ---
 Unsupported Confluence API call
 
@@ -43,7 +43,7 @@ def __init__(self, space_key, uname, pw_set, token_set, extras):
         uname_value = uname if uname else '(empty)'
         pw_value = '<set>' if pw_set else '(empty)'
         token_value = '<set>' if token_set else '(empty)'
-        super(ConfluenceBadSpaceError, self).__init__('''
+        super().__init__('''
 ---
 Invalid Confluence URL detected
 
@@ -66,7 +66,7 @@ def __init__(self, space_key, uname, pw_set, token_set, extras):
 
 class ConfluenceBadServerUrlError(ConfluenceError):
     def __init__(self, server_url, ex):
-        super(ConfluenceBadServerUrlError, self).__init__('''
+        super().__init__('''
 ---
 Invalid Confluence URL detected
 
@@ -83,7 +83,7 @@ def __init__(self, server_url, ex):
 
 class ConfluenceCertificateError(ConfluenceError):
     def __init__(self, ex):
-        super(ConfluenceCertificateError, self).__init__('''
+        super().__init__('''
 ---
 SSL certificate issue
 
@@ -101,7 +101,7 @@ class ConfluenceConfigurationError(ConfluenceError, ConfigError):
 
 class ConfluenceMissingPageIdError(ConfluenceError):
     def __init__(self, space_key, page_id):
-        super(ConfluenceMissingPageIdError, self).__init__('''
+        super().__init__('''
 ---
 Unable to find a requested page
 
@@ -117,7 +117,7 @@ def __init__(self, space_key, page_id):
 
 class ConfluencePermissionError(ConfluenceError):
     def __init__(self, details):
-        super(ConfluencePermissionError, self).__init__('''
+        super().__init__('''
 ---
 Permission denied on Confluence ({desc})
 
@@ -130,7 +130,7 @@ def __init__(self, details):
 
 class ConfluenceProxyPermissionError(ConfluenceError):
     def __init__(self):
-        super(ConfluenceProxyPermissionError, self).__init__('''
+        super().__init__('''
 ---
 Unable to authenticate with the proxy server
 
@@ -148,7 +148,7 @@ class ConfluencePublishCheckError(ConfluenceError):
 
 class ConfluencePublishAncestorError(ConfluencePublishCheckError):
     def __init__(self, page_name):
-        super(ConfluencePublishAncestorError, self).__init__('''
+        super().__init__('''
 ---
 Ancestor publish check failed for: {name}
 
@@ -177,7 +177,7 @@ def __init__(self, page_name):
 
 class ConfluencePublishSelfAncestorError(ConfluencePublishCheckError):
     def __init__(self, page_name):
-        super(ConfluencePublishSelfAncestorError, self).__init__('''
+        super().__init__('''
 ---
 Ancestor (self) publish check failed for: {name}
 
@@ -198,7 +198,7 @@ def __init__(self, page_name):
 
 class ConfluenceRateLimited(ConfluenceError):
     def __init__(self):
-        super(ConfluenceRateLimited, self).__init__('''
+        super().__init__('''
 ---
 Request has been rate limited
 
@@ -211,7 +211,7 @@ def __init__(self):
 
 class ConfluenceSeraphAuthenticationFailedUrlError(ConfluenceError):
     def __init__(self):
-        super(ConfluenceSeraphAuthenticationFailedUrlError, self).__init__('''
+        super().__init__('''
 ---
 Unable to authenticate with the Confluence instance (Seraph)
 
@@ -226,7 +226,7 @@ def __init__(self):
 
 class ConfluenceSslError(ConfluenceError):
     def __init__(self, server_url, ex):
-        super(ConfluenceSslError, self).__init__('''
+        super().__init__('''
 ---
 SSL connection issue has been detected
 
@@ -249,7 +249,7 @@ def __init__(self, server_url, ex):
 
 class ConfluenceTimeoutError(ConfluenceError):
     def __init__(self, server_url):
-        super(ConfluenceTimeoutError, self).__init__('''
+        super().__init__('''
 ---
 Connection has timed out
 
@@ -265,7 +265,7 @@ def __init__(self, server_url):
 
 class ConfluenceUnreconciledPageError(ConfluenceError):
     def __init__(self, page_name, page_id, url, ex):
-        super(ConfluenceUnreconciledPageError, self).__init__('''
+        super().__init__('''
 ---
 Unable to update unreconciled page: {name} (id: {id})
 

sphinxcontrib/confluencebuilder/rest.py

@@ -38,7 +38,7 @@
 class SslAdapter(HTTPAdapter):
     def __init__(self, config, *args, **kwargs):
         self._config = config
-        super(SslAdapter, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def init_poolmanager(self, *args, **kwargs):
         context = ssl.create_default_context()
@@ -60,10 +60,10 @@ def init_poolmanager(self, *args, **kwargs):
             context.check_hostname = False
 
         kwargs['ssl_context'] = context
-        return super(SslAdapter, self).init_poolmanager(*args, **kwargs)
+        return super().init_poolmanager(*args, **kwargs)
 
     def cert_verify(self, conn, url, verify, *args, **kwargs):
-        super(SslAdapter, self).cert_verify(conn, url, verify, *args, **kwargs)
+        super().cert_verify(conn, url, verify, *args, **kwargs)
 
         # prevent requests from injected an embedded certificates to instead
         # rely on the default certificate stores loaded by the context

tests/lib/testcase.py

@@ -31,7 +31,7 @@ def test_storage_example(self):
                 ...
         """
 
-        super(ConfluenceTestCase, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.builder = DEFAULT_BUILDER
 

tests/unit-tests/test_config_checks.py

@@ -30,7 +30,7 @@ def run(self, result=None):
         # unique configuration each run to avoid copying it in each test
         self.config = prepare_conf()
 
-        super(TestConfluenceConfigChecks, self).run(result)
+        super().run(result)
 
     def _prepare_valid_publish(self):
         self.config['confluence_publish'] = True

tests/unit-tests/test_config_env.py

@@ -20,7 +20,7 @@ def run(self, result=None):
         # ensure environment overrides do not leak between tests
         old_env = dict(os.environ)
         try:
-            super(TestConfluenceConfigEnvironment, self).run(result)
+            super().run(result)
         finally:
             os.environ.clear()
             os.environ.update(old_env)

tests/unit-tests/test_config_header_footer.py

@@ -10,7 +10,7 @@
 class TestConfluenceConfigHeaderFooter(ConfluenceTestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestConfluenceConfigHeaderFooter, cls).setUpClass()
+        super().setUpClass()
 
         cls.dataset = os.path.join(cls.datasets, 'header-footer')
 

tests/unit-tests/test_config_hierarchy.py

@@ -9,7 +9,7 @@
 class TestConfluenceHierarchy(ConfluenceTestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestConfluenceHierarchy, cls).setUpClass()
+        super().setUpClass()
 
         cls.dataset = os.path.join(cls.datasets, 'hierarchy')
 

tests/unit-tests/test_config_orphan.py

@@ -13,7 +13,7 @@
 class TestConfluenceConfigOrphan(ConfluenceTestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestConfluenceConfigOrphan, cls).setUpClass()
+        super().setUpClass()
 
         cls.dataset = os.path.join(cls.datasets, 'orphan')
 
@@ -25,7 +25,7 @@ def run(self, result=None):
         with patch.object(ConfluencePublisher, 'connect'), \
                 patch.object(ConfluencePublisher, 'disconnect'), \
                 patch.object(ConfluenceBuilder, 'publish_asset'):
-            super(TestConfluenceConfigOrphan, self).run(result)
+            super().run(result)
 
     def test_config_orphan_allow_explicit(self):
         config = dict(self.config)

tests/unit-tests/test_config_postfix_formatting.py

@@ -102,7 +102,7 @@ def test_placeholder_with_format_type(self):
 class TestRegisterTitle(ConfluenceTestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestRegisterTitle, cls).setUpClass()
+        super().setUpClass()
         cls.config['root_doc'] = 'index'
         cls.dataset = os.path.join(cls.datasets, 'postfix_formatting')