diff --git a/apprise/cli.py b/apprise/cli.py index 11a6cbc2..ac355a38 100644 --- a/apprise/cli.py +++ b/apprise/cli.py @@ -121,7 +121,7 @@ if platform.system() == 'Windows': # Global Support # - # C:\ProgramData\Apprise\ + # C:\ProgramData\Apprise expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise'), expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise.conf'), expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise.yml'), diff --git a/apprise/plugins/bulksms.py b/apprise/plugins/bulksms.py index 29c4d7fa..9bbbefe5 100644 --- a/apprise/plugins/bulksms.py +++ b/apprise/plugins/bulksms.py @@ -269,7 +269,7 @@ class NotifyBulkSMS(NotifyBase): 'to': None, 'body': body, 'routingGroup': self.route, - 'encoding': BulkSMSEncoding.UNICODE \ + 'encoding': BulkSMSEncoding.UNICODE if self.unicode else BulkSMSEncoding.TEXT, # Options are NONE, ALL and ERRORS 'deliveryReports': "ERRORS" diff --git a/apprise/plugins/lametric.py b/apprise/plugins/lametric.py index 411b9ea2..7fdd8ebc 100644 --- a/apprise/plugins/lametric.py +++ b/apprise/plugins/lametric.py @@ -938,7 +938,7 @@ class NotifyLametric(NotifyBase): LAMETRIC_IS_APP_TOKEN.match(results['password'])) and # Scan for app_ flags - next((f for f in results.keys() \ + next((f for f in results.keys() if f.startswith('app_')), None) is None) \ else LametricMode.CLOUD diff --git a/test/test_plugin_mattermost.py b/test/test_plugin_mattermost.py index 8fb9c249..4def2576 100644 --- a/test/test_plugin_mattermost.py +++ b/test/test_plugin_mattermost.py @@ -66,10 +66,10 @@ apprise_url_tests = ( ('mmost://localhost/3ccdd113474722377935511fc85d3dd4' '?to=test&image=True', { 'instance': NotifyMattermost}), - ('mmost://localhost/3ccdd113474722377935511fc85d3dd4' \ + ('mmost://localhost/3ccdd113474722377935511fc85d3dd4' '?to=test&image=False', { 'instance': NotifyMattermost}), - ('mmost://localhost/3ccdd113474722377935511fc85d3dd4' \ + ('mmost://localhost/3ccdd113474722377935511fc85d3dd4' '?to=test&image=True', { 'instance': NotifyMattermost, # don't include an image by default diff --git a/test/test_plugin_office365.py b/test/test_plugin_office365.py index 9a6a001e..cca9e1e9 100644 --- a/test/test_plugin_office365.py +++ b/test/test_plugin_office365.py @@ -96,7 +96,7 @@ apprise_url_tests = ( }, # Our expected url(privacy=True) startswith() response: - 'privacy_url': 'o365://t...t:user@example.com/a...h/' \ + 'privacy_url': 'o365://t...t:user@example.com/a...h/' '****/email1%40test.ca/'}), # test our arguments ('o365://_/?oauth_id={cid}&oauth_secret={secret}&tenant={tenant}' @@ -117,7 +117,7 @@ apprise_url_tests = ( }, # Our expected url(privacy=True) startswith() response: - 'privacy_url': 'o365://t...t:user@example.com/a...h/' \ + 'privacy_url': 'o365://t...t:user@example.com/a...h/' '****/email1%40test.ca/'}), # Test invalid JSON (no tenant defaults to email domain) ('o365://{tenant}:{aid}/{cid}/{secret}/{targets}'.format( diff --git a/test/test_plugin_sns.py b/test/test_plugin_sns.py index 56c49828..9ba8ad3b 100644 --- a/test/test_plugin_sns.py +++ b/test/test_plugin_sns.py @@ -376,7 +376,7 @@ def test_plugin_sns_aws_topic_handling(mock_post): # Multi-Topic 'sns://T1JJ3T3L2/A1BRTD4JD/TIiajkdnl/us-east-1/TopicA/TopicB/' # Topic-Mix - 'sns://T1JJ3T3L2/A1BRTD4JD/TIiajkdnlazkce/us-west-2/' \ + 'sns://T1JJ3T3L2/A1BRTD4JD/TIiajkdnlazkce/us-west-2/' '12223334444/TopicA']) # CreateTopic fails diff --git a/test/test_plugin_splunk.py b/test/test_plugin_splunk.py index a6da5707..d9e50a9c 100644 --- a/test/test_plugin_splunk.py +++ b/test/test_plugin_splunk.py @@ -66,13 +66,13 @@ apprise_url_tests = ( 'instance': NotifySplunk, }), # Support legacy URL - ('https://alert.victorops.com/integrations/generic/20131114/' \ + ('https://alert.victorops.com/integrations/generic/20131114/' 'alert/apikey/routing_key', { # We're good 'instance': NotifySplunk, }), # Support legacy URL (with entity id provided) - ('https://alert.victorops.com/integrations/generic/20131114/' \ + ('https://alert.victorops.com/integrations/generic/20131114/' 'alert/apikey/routing_key/entity_id', { # We're good 'instance': NotifySplunk, diff --git a/test/test_plugin_threema.py b/test/test_plugin_threema.py index f3ee80b2..a424bd0b 100644 --- a/test/test_plugin_threema.py +++ b/test/test_plugin_threema.py @@ -116,7 +116,7 @@ def test_plugin_threema(): AppriseURLTester(tests=apprise_url_tests).run_all() -@ mock.patch('requests.post') +@mock.patch('requests.post') def test_plugin_threema_edge_cases(mock_post): """ NotifyThreema() Edge Cases diff --git a/test/test_plugin_voipms.py b/test/test_plugin_voipms.py index 1e09f5dc..1cad9918 100644 --- a/test/test_plugin_voipms.py +++ b/test/test_plugin_voipms.py @@ -170,7 +170,7 @@ def test_plugin_voipms(): AppriseURLTester(tests=apprise_url_tests).run_all() -@ mock.patch('requests.get') +@mock.patch('requests.get') def test_plugin_voipms_edge_cases(mock_get): """ NotifyVoipms() Edge Cases