Merge pull request #885 from sphinx-contrib/maintenance/2024-02-25

maintenance (2024-02-25)
sphinx-contrib · Feb 25, 2024 · 8eac40c · 8eac40c
2 parents ee92614 + 308fd6e
commit 8eac40c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+Development
+===========
+
+* Fixed issue where an exception could throw without cleanup options set
+* Provide extended debugging options for publish events
+
 2.4.0 (2023-12-14)
 ==================
 

diff --git a/sphinxcontrib/confluencebuilder/exceptions.py b/sphinxcontrib/confluencebuilder/exceptions.py
@@ -86,7 +86,6 @@ def __init__(self, space_key, page_id):
 
       Space: {space_key}
     Page Id: {page_id}
-
 ---
 '''.format(space_key=space_key, page_id=page_id))
 
@@ -240,7 +239,6 @@ def __init__(self, server_url):
 configured Confluence URL is valid:
 
    {url}
-
 ---
 '''.format(url=server_url))
 

diff --git a/sphinxcontrib/confluencebuilder/rest.py b/sphinxcontrib/confluencebuilder/rest.py
@@ -66,8 +66,8 @@ def init_poolmanager(self, *args, **kwargs):
     def cert_verify(self, 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
+        # prevent requests from injecting embedded certificates instead of
+        # relying on the default certificate stores loaded by the context
         if verify is True and not self._config.confluence_adv_embedded_certs:
             conn.ca_certs = None