more test coverage

Author: caronc

apprise/apprise.py

@@ -494,7 +494,7 @@ def _create_notify_gen(
                 f"type: {self.asset.encoding}"
             )
             logger.error(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         # Tracks conversions
         conversion_body_map = {}
@@ -581,7 +581,7 @@ def _create_notify_gen(
                         # Must be of string type
                         msg = "Failed to escape message body"
                         logger.error(msg)
-                        raise TypeError(msg)
+                        raise TypeError(msg) from None
 
                 if server.interpret_emojis:
                     #

apprise/apprise.pyi

@@ -102,11 +102,8 @@ def __init__(
         self.location = location
 
         # Now parse any paths specified
-        if paths is not None:
-            # Store our path(s)
-            if not self.add(paths):
-                # Parse Source domain based on from_addr
-                raise TypeError("One or more attachments could not be added.")
+        if paths is not None and not self.add(paths):
+            raise TypeError("One or more attachments could not be added.")
 
     def add(self, attachments, asset=None, cache=None):
         """Adds one or more attachments into our list.

apprise/apprise_attachment.py

@@ -255,7 +255,7 @@ def __init__(
                     raise ValueError(
                         "AppriseAsset namespace_salt(): "
                         "Value provided could not be encoded"
-                    )
+                    ) from None
 
             else:  # Unsupported
                 raise ValueError(

apprise/apprise_attachment.pyi

@@ -160,7 +160,7 @@ def __init__(self, name=None, mimetype=None, cache=None, **kwargs):
             except (TypeError, ValueError):
                 err = f"An invalid cache value ({cache}) was specified."
                 self.logger.warning(err)
-                raise TypeError(err)
+                raise TypeError(err) from None
 
             # Some simple error checking
             if self.cache < 0:
@@ -172,8 +172,7 @@ def __init__(self, name=None, mimetype=None, cache=None, **kwargs):
             self.cache = None
 
         # Validate mimetype if specified
-        if self._mimetype:
-            if (
+        if self._mimetype and (
                 next(
                     (
                         t
@@ -182,11 +181,10 @@ def __init__(self, name=None, mimetype=None, cache=None, **kwargs):
                     ),
                     None,
                 )
-                is None
-            ):
-                err = f"An invalid mime-type ({mimetype}) was specified."
-                self.logger.warning(err)
-                raise TypeError(err)
+                is None):
+            err = f"An invalid mime-type ({mimetype}) was specified."
+            self.logger.warning(err)
+            raise TypeError(err)
 
         return
 
@@ -318,9 +316,9 @@ def base64(self, encoding="ascii"):
                     else base64.b64encode(f.read())
                 )
 
-        except (TypeError, FileNotFoundError):
+        except (FileNotFoundError):
             # We no longer have a path to open
-            raise exception.AppriseFileNotFound("Attachment Missing")
+            raise exception.AppriseFileNotFound("Attachment Missing") from None
 
         except (TypeError, OSError) as e:
             self.logger.warning(
@@ -329,7 +327,8 @@ def base64(self, encoding="ascii"):
                 )
             )
             self.logger.debug(f"I/O Exception: {e!s}")
-            raise exception.AppriseDiskIOError("Attachment Access Error")
+            raise exception.AppriseDiskIOError(
+                "Attachment Access Error") from e
 
     def invalidate(self):
         """Release any temporary data that may be open by child classes.
@@ -367,7 +366,7 @@ def download(self):
 
     def open(self, mode="rb"):
         """Return our file pointer and track it (we'll auto close later)"""
-        pointer = open(self.path, mode=mode)
+        pointer = open(self.path, mode=mode)  # noqa: SIM115
         self.__pointers.add(pointer)
         return pointer
 

apprise/apprise_config.pyi

@@ -113,7 +113,7 @@ def download(self, **kwargs):
 
         url = f"{self.schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ":%d" % self.port
+            url += f":{self.port}"
 
         url += self.fullpath
 
@@ -194,7 +194,8 @@ def download(self, **kwargs):
                     # to False or it isn't compatible with Microsoft Windows
                     # instances. In lieu of this, __del__ will clean up the
                     # file for us.
-                    self._temp_file = NamedTemporaryFile(delete=False)
+                    self._temp_file = \
+                        NamedTemporaryFile(delete=False)  # noqa: SIM115
 
                     # Get our chunk size
                     chunk_size = self.chunk_size
@@ -219,8 +220,8 @@ def download(self, **kwargs):
                                     self.logger.error(
                                         "HTTP response exceeds allowable"
                                         " maximum file length"
-                                        f" ({int(self.max_file_size / 1024)}KB):"
-                                        f" {self.url(privacy=True)}"
+                                        f" ({int(self.max_file_size / 1024)}"
+                                        f"KB): {self.url(privacy=True)}"
                                     )
 
                                     # Invalidate any variables previously set