PEP E501 (file length) fix applied

Author: caronc

apprise/attachment/http.py

@@ -25,6 +25,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
 import os
 import re
 from tempfile import NamedTemporaryFile
@@ -286,13 +287,10 @@ def invalidate(self):
             self.logger.trace("Attachment cleanup of %s", self._temp_file.name)
             self._temp_file.close()
 
-            try:
+            with contextlib.suppress(OSError):
                 # Ensure our file is removed (if it exists)
                 os.unlink(self._temp_file.name)
 
-            except OSError:
-                pass
-
             # Reset our temporary file to prevent from entering
             # this block again
             self._temp_file = None

apprise/logger.py

@@ -25,6 +25,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
 from io import StringIO
 import logging
 import os
@@ -186,12 +187,8 @@ def __exit__(self, exc_type, exc_value, tb):
             self.__buffer_ptr.close()
             self.__handler.close()
             if self.__delete:
-                try:
+                with contextlib.suppress(OSError):
                     # Always remove file afterwards
                     os.unlink(self.__path)
 
-                except OSError:
-                    # It's okay if the file does not exist
-                    pass
-
         return exc_type is None

apprise/persistent_store.py

@@ -23,6 +23,7 @@
 # THE SOFTWARE.
 import base64
 import binascii
+import contextlib
 from datetime import datetime, timedelta, timezone
 import glob
 import gzip
@@ -52,13 +53,9 @@ def _ntf_tidy(ntf):
     """Reusable NamedTemporaryFile cleanup."""
     if ntf:
         # Cleanup
-        try:
+        with contextlib.suppress(OSError):
             ntf.close()
 
-        except OSError:
-            # Already closed
-            pass
-
         try:
             os.unlink(ntf.name)
             logger.trace("Persistent temporary file removed: %s", ntf.name)

apprise/plugins/aprs.py

@@ -66,6 +66,7 @@
 # http://www.aprs.org/doc/APRS101.PDF
 #
 
+import contextlib
 from itertools import chain
 import re
 import socket
@@ -321,13 +322,8 @@ def __init__(self, targets=None, locale=None, delay=None, **kwargs):
     def socket_close(self):
         """Closes the socket connection whereas present."""
         if self.sock:
-            try:
+            with contextlib.suppress(Exception):
                 self.sock.close()
-
-            except Exception:
-                # No worries if socket exception thrown on close()
-                pass
-
             self.sock = None
 
     def socket_open(self):

apprise/plugins/base.py

@@ -187,10 +187,11 @@ class NotifyBase(URLBase):
                 "default": overflow_mode,
                 # look up default using the following parent class value at
                 # runtime. The variable name identified here (in this case
-                # overflow_mode) is checked and it's result is placed over-top of
-                # the 'default'. This is done because once a parent class inherits
-                # this one, the overflow_mode already set as a default 'could' be
-                # potentially over-ridden and changed to a different value.
+                # overflow_mode) is checked and it's result is placed over-top
+                # of the 'default'. This is done because once a parent class
+                # inherits this one, the overflow_mode already set as a default
+                # 'could' be potentially over-ridden and changed to a different
+                # value.
                 "_lookup_default": "overflow_mode",
             },
             "format": {

apprise/plugins/d7networks.py

@@ -133,10 +133,11 @@ class NotifyD7Networks(NotifyBase):
                 "alias_of": "targets",
             },
             "source": {
-                # Originating address,In cases where the rewriting of the sender's
-                # address is supported or permitted by the SMS-C. This is used to
-                # transmit the message, this number is transmitted as the
-                # originating address and is completely optional.
+                # Originating address,In cases where the rewriting of the
+                # sender's address is supported or permitted by the SMS-C.
+                # This is used to transmit the message, this number is
+                # transmitted as the originating address and is completely
+                # optional.
                 "name": _("Originating Address"),
                 "type": "string",
                 "map_to": "source",

apprise/plugins/gnome.py

@@ -144,9 +144,9 @@ class NotifyGnome(NotifyBase):
                 "default": GnomeUrgency.NORMAL,
             },
             "priority": {
-                # Apprise uses 'priority' everywhere; it's just a nice consistent
-                # feel to be able to use it here as well. Just map the
-                # value back to 'priority'
+                # Apprise uses 'priority' everywhere; it's just a nice
+                # consistent feel to be able to use it here as well. Just map
+                # the value back to 'priority'
                 "alias_of": "urgency",
             },
             "image": {

apprise/plugins/gotify.py

@@ -27,7 +27,7 @@
 
 # Gotify Docker configuration: https://hub.docker.com/r/gotify/server
 # Example: https://github.com/gotify/server/blob/\
-#        f2c2688f0b5e6a816bbcec768ca1c0de5af76b88/ADD_MESSAGE_EXAMPLES.md#python
+#      f2c2688f0b5e6a816bbcec768ca1c0de5af76b88/ADD_MESSAGE_EXAMPLES.md#python
 # API: https://gotify.net/docs/swagger-docs
 
 from json import dumps

apprise/plugins/lametric.py

@@ -86,6 +86,7 @@
 # - https://developer.lametric.com/icons
 
 
+import contextlib
 from json import dumps
 import re
 
@@ -1103,13 +1104,9 @@ def parse_url(url):
                 )
 
         # Set cycles
-        try:
+        with contextlib.suppress(TypeError, ValueError):
             results["cycles"] = abs(int(results["qsd"].get("cycles")))
 
-        except (TypeError, ValueError):
-            # Not a valid integer; ignore entry
-            pass
-
         return results
 
     @staticmethod

apprise/plugins/lark.py

@@ -96,7 +96,9 @@ def url(self, privacy=False, *args, **kwargs):
         """Returns the URL built dynamically based on specified arguments."""
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
         return (
-            f"{self.secure_protocol}://{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/?{NotifyLark.urlencode(params)}"
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{NotifyLark.urlencode(params)}"
         )
 
     def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):