PEP E501 (file length) fix applied

caronc · caronc · commit 7807c7aa109c · 2025-07-20T12:20:45.000-04:00
diff --git a/apprise/plugins/base.py b/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": {
diff --git a/apprise/plugins/d7networks.py b/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",
diff --git a/apprise/plugins/gnome.py b/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": {
diff --git a/apprise/plugins/gotify.py b/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
diff --git a/apprise/plugins/lark.py b/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):
diff --git a/apprise/plugins/nextcloud.py b/apprise/plugins/nextcloud.py
@@ -108,8 +108,8 @@ class NotifyNextcloud(NotifyBase):
         NotifyBase.template_args,
         **{
             # Nextcloud uses different API end points depending on the version
-            # being used however the (API) payload remains the same.  Allow users
-            # to specify the version they are using:
+            # being used however the (API) payload remains the same.  Allow
+            # users to specify the version they are using:
             "version": {
                 "name": _("Version"),
                 "type": "int",
diff --git a/apprise/plugins/one_signal.py b/apprise/plugins/one_signal.py
@@ -454,7 +454,8 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
 
                 self.logger.debug(
                     "OneSignal POST URL:"
-                    f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+                    f" {self.notify_url} "
+                    f"(cert_verify={self.verify_certificate!r})"
                 )
                 self.logger.debug(f"OneSignal Payload: {payload!s}")
 
diff --git a/apprise/plugins/pagerduty.py b/apprise/plugins/pagerduty.py
@@ -179,8 +179,8 @@ class NotifyPagerDuty(NotifyBase):
                 "default": PagerDutyRegion.US,
                 "map_to": "region_name",
             },
-            # The severity is automatically determined, however you can optionally
-            # over-ride its value and force it to be what you want
+            # The severity is automatically determined, however you can
+            # optionally over-ride its value and force it to be what you want
             "severity": {
                 "name": _("Severity"),
                 "type": "choice:string",
@@ -276,8 +276,9 @@ def __init__(
 
             if self.region_name not in PAGERDUTY_REGIONS:
                 # allow the outer except to handle this common response
-                raise
-        except:
+                raise IndexError()
+
+        except (AttributeError, IndexError, TypeError):
             # Invalid region specified
             msg = f"The PagerDuty region specified ({region_name}) is invalid."
             self.logger.warning(msg)
diff --git a/apprise/plugins/popcorn_notify.py b/apprise/plugins/popcorn_notify.py
@@ -240,8 +240,8 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
             except requests.RequestException as e:
                 self.logger.warning(
                     "A Connection error occured sending"
-                    f" {len(self.targets[index:index + batch_size])} PopcornNotify"
-                    " notification(s)."
+                    f" {len(self.targets[index:index + batch_size])} "
+                    "PopcornNotify notification(s)."
                 )
                 self.logger.debug(f"Socket Exception: {e!s}")
 
diff --git a/apprise/plugins/pushplus.py b/apprise/plugins/pushplus.py
@@ -90,7 +90,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)}/?{self.urlencode(params)}"
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
         )
 
     @property
diff --git a/apprise/plugins/qq.py b/apprise/plugins/qq.py
@@ -94,7 +94,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)}/?{self.urlencode(params)}"
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
         )
 
     @property
diff --git a/apprise/plugins/ses.py b/apprise/plugins/ses.py
@@ -692,7 +692,8 @@ def aws_prepare_request(self, payload, reference=None):
         # Our Authorization header
         headers["Authorization"] = ", ".join([
             (
-                f"{self.aws_auth_algorithm} Credential={self.aws_access_key_id}/{scope}"
+                f"{self.aws_auth_algorithm} "
+                f"Credential={self.aws_access_key_id}/{scope}"
             ),
             "SignedHeaders={signed_headers}".format(
                 signed_headers=";".join(signed_headers.keys()),
diff --git a/apprise/plugins/seven.py b/apprise/plugins/seven.py
@@ -99,10 +99,11 @@ class NotifySeven(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",
diff --git a/apprise/plugins/sns.py b/apprise/plugins/sns.py
@@ -419,7 +419,8 @@ def aws_prepare_request(self, payload, reference=None):
             ("content-type", headers["Content-Type"]),
             (
                 "host",
-                f"{self.aws_service_name}.{self.aws_region_name}.amazonaws.com",
+                f"{self.aws_service_name}"
+                f".{self.aws_region_name}.amazonaws.com",
             ),
             ("x-amz-date", headers["X-Amz-Date"]),
         ])
@@ -455,7 +456,8 @@ def aws_prepare_request(self, payload, reference=None):
         # Our Authorization header
         headers["Authorization"] = ", ".join([
             (
-                f"{self.aws_auth_algorithm} Credential={self.aws_access_key_id}/{scope}"
+                f"{self.aws_auth_algorithm} "
+                f"Credential={self.aws_access_key_id}/{scope}"
             ),
             "SignedHeaders={signed_headers}".format(
                 signed_headers=";".join(signed_headers.keys()),
diff --git a/apprise/plugins/spike.py b/apprise/plugins/spike.py
@@ -101,7 +101,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)}/?{self.urlencode(params)}"
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
         )
 
     def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
diff --git a/apprise/plugins/spugpush.py b/apprise/plugins/spugpush.py
@@ -92,7 +92,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)}/?{self.urlencode(params)}"
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
         )
 
     @property
diff --git a/apprise/plugins/vapid/__init__.py b/apprise/plugins/vapid/__init__.py
@@ -172,7 +172,8 @@ class NotifyVapid(NotifyBase):
                 "map_to": "mode",
             },
             # Default Time To Live (defined in seconds)
-            # 0 (Zero) - message will be delivered only if the device is reacheable
+            # 0 (Zero) - message will be delivered only if the device is
+            # reacheable
             "ttl": {
                 "name": _("ttl"),
                 "type": "int",
@@ -280,8 +281,9 @@ def __init__(
 
             if self.mode not in VAPID_PUSH_MODES:
                 # allow the outer except to handle this common response
-                raise
-        except:
+                raise IndexError()
+
+        except (AttributeError, IndexError, TypeError):
             # Invalid region specified
             msg = f"The Vapid mode specified ({mode}) is invalid."
             self.logger.warning(msg)
diff --git a/apprise/plugins/vonage.py b/apprise/plugins/vonage.py
@@ -126,10 +126,10 @@ class NotifyVonage(NotifyBase):
                 "alias_of": "secret",
             },
             # Default Time To Live
-            # By default Vonage attempt delivery for 72 hours, however the maximum
-            # effective value depends on the operator and is typically 24 - 48
-            # hours. We recommend this value should be kept at its default or at
-            # least 30 minutes.
+            # By default Vonage attempt delivery for 72 hours, however the
+            # maximum effective value depends on the operator and is typically
+            # 24 - 48 hours. We recommend this value should be kept at its
+            # default or at least 30 minutes.
             "ttl": {
                 "name": _("ttl"),
                 "type": "int",
diff --git a/apprise/plugins/wecombot.py b/apprise/plugins/wecombot.py
@@ -93,7 +93,8 @@ class NotifyWeComBot(NotifyBase):
     template_tokens = dict(
         NotifyBase.template_tokens,
         **{
-            # The Bot Key can be found at the end of the webhook provided (?key=)
+            # The Bot Key can be found at the end of the webhook provided
+            # (?key=)
             "key": {
                 "name": _("Bot Webhook Key"),
                 "type": "string",
diff --git a/apprise/utils/parse.py b/apprise/utils/parse.py
@@ -467,13 +467,13 @@ def parse_qsd(qs, simple=False, plus_to_space=False, sanitize=True):
     # Our return result set:
     result = (
         {
-            # The arguments passed in (the parsed query). This is in a dictionary
-            # of {'key': 'val', etc }.  Keys are all made lowercase before storing
-            # to simplify access to them.
+            # The arguments passed in (the parsed query). This is in a
+            # dictionary of {'key': 'val', etc }.  Keys are all made lowercase
+            # before storing to simplify access to them.
             "qsd": {},
-            # Detected Entries that start with + or - are additionally stored in
-            # these values (un-touched).  The :,+,- however are stripped from their
-            # name before they are stored here.
+            # Detected Entries that start with + or - are additionally stored
+            # in these values (un-touched).  The :,+,- however are stripped
+            # from their name before they are stored here.
             "qsd+": {},
             "qsd-": {},
             "qsd:": {},
@@ -624,14 +624,14 @@ def parse_url(
             "schema": None,
             # The schema
             "url": None,
-            # The arguments passed in (the parsed query). This is in a dictionary
-            # of {'key': 'val', etc }.  Keys are all made lowercase before storing
-            # to simplify access to them.
+            # The arguments passed in (the parsed query). This is in a
+            # dictionary of {'key': 'val', etc }.  Keys are all made lowercase
+            # before storing to simplify access to them.
             # qsd = Query String Dictionary
             "qsd": {},
-            # Detected Entries that start with +, - or : are additionally stored in
-            # these values (un-touched).  The +, -, and : however are stripped
-            # from their name before they are stored here.
+            # Detected Entries that start with +, - or : are additionally
+            # stored in these values (un-touched).  The +, -, and : however
+            # are stripped from their name before they are stored here.
             "qsd+": {},
             "qsd-": {},
             "qsd:": {},
diff --git a/apprise/utils/pem.py b/apprise/utils/pem.py
@@ -518,8 +518,8 @@ def public_key(
             if (
                 self.load_public_key(path)
                 or
-                # Try to see if we can load a private key (which we can generate a
-                # public from)
+                # Try to see if we can load a private key (which we ca
+                # generate a public from)
                 self.private_key(*names, autogen=autogen)
             )
             else None
diff --git a/pyproject.toml b/pyproject.toml
@@ -323,9 +323,6 @@ ignore = [
 
   # The following needs to be supported at some point and is of great value
   "RUF012",  # typing.ClassVar implimentation
-  "E501",    # Enforcing wordrap at 79 characters per BSD should be enforced
-             # it broke when ruff-autofixed over 600+ entries to accomodate
-             # other PEP styles.
   "SIM105",  # leverage contextlib.supress() so signifigantly simply the
              # readability of the code
   "UP032",   # This is a massive undertaking and requires a massive rewrite
diff --git a/tests/test_plugin_bulkvs.py b/tests/test_plugin_bulkvs.py
@@ -90,7 +90,8 @@
             "a" * 5, "b" * 10, "3" * 11
         ),
         {
-            # included phone, short number (123) and garbage string (abcd) dropped
+            # included phone, short number (123) and garbage string (abcd)
+            # dropped
             "instance": NotifyBulkVS,
             "privacy_url": "bulkvs://a...a:****@9876543210/33333333333",
         },
diff --git a/tests/test_plugin_d7networks.py b/tests/test_plugin_d7networks.py
@@ -136,7 +136,8 @@
     (
         "d7sms://token@{}?batch=yes&source=apprise".format("3" * 14),
         {
-            # valid number, utilizing the optional source= variable (same as from)
+            # valid number, utilizing the optional source= variable (same as
+            # from)
             "instance": NotifyD7Networks,
         },
     ),
diff --git a/tests/test_plugin_email.py b/tests/test_plugin_email.py
@@ -900,7 +900,8 @@ def login(self, *args, **kwargs):
     # Further test encoding through the message content as well
     assert (
         obj.notify(
-            # Google Translated to Arabic: "Let's make the world a better place."
+            # Google Translated to Arabic:
+            #  "Let's make the world a better place."
             title="دعونا نجعل العالم مكانا أفضل.",
             # Google Translated to Hungarian: "One line of code at a time.'
             body="Egy sor kódot egyszerre.",
diff --git a/tests/test_plugin_enigma2.py b/tests/test_plugin_enigma2.py
@@ -59,7 +59,8 @@
         "enigma2://localhost",
         {
             "instance": NotifyEnigma2,
-            # This will fail because we're also expecting a server acknowledgement
+            # This will fail because we're also expecting a server
+            # acknowledgement
             "notify_response": False,
         },
     ),
diff --git a/tests/test_plugin_httpsms.py b/tests/test_plugin_httpsms.py
@@ -81,7 +81,8 @@
     (
         "httpsms://{}@9876543210/{}/abcd/".format("b" * 10, "3" * 11),
         {
-            # included phone, short number (123) and garbage string (abcd) dropped
+            # included phone, short number (123) and garbage string (abcd)
+            # dropped
             "instance": NotifyHttpSMS,
             "privacy_url": "httpsms://b...b@9876543210/33333333333",
         },
diff --git a/tests/test_plugin_mastodon.py b/tests/test_plugin_mastodon.py
@@ -144,8 +144,8 @@
         "mastodon://access_token@hostname/?key=My%20Idempotency%20Key",
         {
             # Prevent duplicate submissions of the same status. Idempotency
-            # keys are stored for up to 1 hour, and can be any arbitrary string.
-            # Consider using a hash or UUID generated client-side.
+            # keys are stored for up to 1 hour, and can be any arbitrary
+            # string. Consider using a hash or UUID generated client-side.
             "instance": NotifyMastodon,
         },
     ),
diff --git a/tests/test_plugin_pushsafer.py b/tests/test_plugin_pushsafer.py
@@ -68,7 +68,8 @@
         "psafer://{}".format("a" * 20),
         {
             "instance": NotifyPushSafer,
-            # This will fail because we're also expecting a server acknowledgement
+            # This will fail because we're also expecting a server
+            # acknowledgement
             "notify_response": False,
         },
     ),
diff --git a/tests/test_plugin_pushy.py b/tests/test_plugin_pushy.py
@@ -95,7 +95,8 @@
         {
             # Invalid topic specified
             "instance": NotifyPushy,
-            # Expected notify() response False because there is no one to notify
+            # Expected notify() response False because there is no one to
+            # notify
             "notify_response": False,
             "requests_response_text": GOOD_RESPONSE,
         },
diff --git a/tests/test_plugin_seven.py b/tests/test_plugin_seven.py
diff --git a/tests/test_plugin_signal.py b/tests/test_plugin_signal.py
diff --git a/tests/test_plugin_sinch.py b/tests/test_plugin_sinch.py
diff --git a/tests/test_plugin_slack.py b/tests/test_plugin_slack.py
diff --git a/tests/test_plugin_smseagle.py b/tests/test_plugin_smseagle.py
diff --git a/tests/test_plugin_twilio.py b/tests/test_plugin_twilio.py
diff --git a/tests/test_plugin_vapid.py b/tests/test_plugin_vapid.py
diff --git a/tests/test_plugin_vonage.py b/tests/test_plugin_vonage.py
diff --git a/tests/test_plugin_whatsapp.py b/tests/test_plugin_whatsapp.py
diff --git a/tests/test_plugin_wxpusher.py b/tests/test_plugin_wxpusher.py

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,8 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):`
`454`	`454`
`455`	`455`	`self.logger.debug(`
`456`	`456`	`"OneSignal POST URL:"`
`457`		`- f" {self.notify_url} (cert_verify={self.verify_certificate!r})"`
	`457`	`+ f" {self.notify_url} "`
	`458`	`+ f"(cert_verify={self.verify_certificate!r})"`
`458`	`459`	`)`
`459`	`460`	`self.logger.debug(f"OneSignal Payload: {payload!s}")`
`460`	`461`