More error catching

	modified:   johnnyfive/confluence.py
	modified:   johnnyfive/gmail.py
	modified:   johnnyfive/slack.py
	modified:   johnnyfive/utils.py

Author: tbowers7

johnnyfive/confluence.py

@@ -45,7 +45,8 @@ class ConfluencePage:
         authentication.  [Default: None]
     use_oauth : bool, optional
         Use OAUTH authentication instead of username/password?  [Default: False]
-    logger :
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
     """
 
     def __init__(self, space, page_title, instance=None, use_oauth=False, logger=None):
@@ -133,7 +134,7 @@ def attach_file(self, filename, name=None, content_type=None, comment=None):
             logger=self.logger,
         )
 
-    def create(self, page_body, parent_id=None):
+    def create(self, page_body, parent_id=None, representation="wiki"):
         """Create a brand new Confluence page
 
         Summon from the depths of computing a new page.
@@ -145,6 +146,9 @@ def create(self, page_body, parent_id=None):
         parent_id : str, optional
             The parent page to place this under.  If none given, the new page
             will be created at the root of ``self.space``. [Default: None]
+        representation : str, optional
+            The Confluence strorage representation to use.  [Default: "wiki"]
+            Use "storage" for XML-based documents
         """
         if not self._check_perm("EDITSPACE", "create a page"):
             return
@@ -156,15 +160,13 @@ def create(self, page_body, parent_id=None):
             )
             return
 
-        print(f" ***** logger: {type(self.logger)}")
-
         johnnyfive.utils.safe_service_connect(
             self.confluence.create_page,
             self.space,
             self.title,
             page_body,
             parent_id=parent_id,
-            representation="wiki",
+            representation=representation,
             editor="v1",
             logger=self.logger,
         )
@@ -396,7 +398,8 @@ def setup_confluence(use_oauth=False, logger=None):
     ----------
     use_oauth : bool, optional
         Use the OAUTH authentication scheme?  [Default: False]
-    logger :
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
 
     Returns
     -------

johnnyfive/gmail.py

@@ -61,7 +61,8 @@ class GmailMessage:
         Display Name of the sender (i.e. which bot) [Default: None]
     fromaddr : `str`, optional
         Sender email address [Default: Value from [gmailSetup]]
-    logger :
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
     """
 
     def __init__(
@@ -189,7 +190,8 @@ class GetMessages:
     before : str, optional
         Date before which to search for messages. Must be in YYYY/MM/DD format.
         [Default: None]
-    logger :
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
     """
 
     def __init__(
@@ -445,7 +447,8 @@ def setup_gmail(interactive=False, logger=None):
     interactive : bool, optional
         Is this session interactive?  Relates to how to deal with toke
         refresh.  [Default: False]
-    logger :
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
 
     Returns
     -------

johnnyfive/slack.py

@@ -149,7 +149,7 @@ def _read_channels(self, name):
 
 
 # Internal Functions =========================================================#
-def setup_slack():
+def setup_slack(logger=None):
     """setup_slack Setup the Slack WebClient for posting
 
     _extended_summary_
@@ -158,8 +158,8 @@ def setup_slack():
     -------
     client : `slack_sdk.web.client.WebClient`
         The WebClient object needed for reading and writing
-    logger : `logging.Logger`
-        The logging thingie
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
     """
     # Read the setup
     setup = johnnyfive.utils.read_ligmos_conffiles("slackSetup")

johnnyfive/utils.py

@@ -190,7 +190,8 @@ def safe_service_connect(func, *args, pause=5, nretries=5, logger=None, **kwargs
     nretries : int, optional
         The total number of times to retry connecting before returning None
         [Default: 10]
-    logger :
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
 
     Returns
     -------
@@ -237,11 +238,12 @@ def safe_service_connect(func, *args, pause=5, nretries=5, logger=None, **kwargs
         except requests.exceptions.HTTPError as exception:
             proper_print(
                 f"Execution of `{func.__name__}` failed because of HTTP error."
-                f"\n{exception}",
-                "except",
+                f"\n{type(exception).__name__}  {exception.args}",
+                "error",
                 logger,
             )
-            proper_print("Aborting...", "error", logger)
+            proper_print("Aborting...", "except", logger)
+            raise exception
             break
 
         # Gmail service error, no retry and pass the exception upward
@@ -298,8 +300,8 @@ def proper_print(msg, level, logger=None):
         The message to convey
     level : str
         The logging level.  One of [``info``,``warn``,``except``]
-    logger : _type_, optional
-        The logger to use, if any [Default: None]
+    logger : :obj:`logging.Logger`, optional
+        The logger object for logging  [Default: None]
     """
     if level == "info":
         if logger is None: