diff --git a/apprise/__init__.py b/apprise/__init__.py index 81373c75..c914a759 100644 --- a/apprise/__init__.py +++ b/apprise/__init__.py @@ -49,16 +49,17 @@ from .common import CONTENT_INCLUDE_MODES from .common import ContentLocation from .common import CONTENT_LOCATIONS -from .URLBase import URLBase -from .URLBase import PrivacyMode -from .plugins.NotifyBase import NotifyBase -from .config.ConfigBase import ConfigBase -from .attachment.AttachBase import AttachBase +from .url import URLBase +from .url import PrivacyMode +from .plugins.base import NotifyBase +from .config.base import ConfigBase +from .attachment.base import AttachBase -from .Apprise import Apprise -from .AppriseAsset import AppriseAsset -from .AppriseConfig import AppriseConfig -from .AppriseAttachment import AppriseAttachment +from .apprise import Apprise +from .locale import AppriseLocale +from .asset import AppriseAsset +from .apprise_config import AppriseConfig +from .apprise_attachment import AppriseAttachment from . import decorators @@ -73,7 +74,7 @@ logging.getLogger(__name__).addHandler(logging.NullHandler()) __all__ = [ # Core 'Apprise', 'AppriseAsset', 'AppriseConfig', 'AppriseAttachment', 'URLBase', - 'NotifyBase', 'ConfigBase', 'AttachBase', + 'NotifyBase', 'ConfigBase', 'AttachBase', 'AppriseLocale', # Reference 'NotifyType', 'NotifyImageSize', 'NotifyFormat', 'OverflowMode', diff --git a/apprise/Apprise.py b/apprise/apprise.py similarity index 99% rename from apprise/Apprise.py rename to apprise/apprise.py index 9a3e8dfc..05a2ee3c 100644 --- a/apprise/Apprise.py +++ b/apprise/apprise.py @@ -33,18 +33,18 @@ from itertools import chain from . import common from .conversion import convert_between from .utils import is_exclusive_match -from .NotificationManager import NotificationManager +from .manager_plugins import NotificationManager from .utils import parse_list from .utils import parse_urls from .utils import cwe312_url from .emojis import apply_emojis from .logger import logger -from .AppriseAsset import AppriseAsset -from .AppriseConfig import AppriseConfig -from .AppriseAttachment import AppriseAttachment -from .AppriseLocale import AppriseLocale -from .config.ConfigBase import ConfigBase -from .plugins.NotifyBase import NotifyBase +from .asset import AppriseAsset +from .apprise_config import AppriseConfig +from .apprise_attachment import AppriseAttachment +from .locale import AppriseLocale +from .config.base import ConfigBase +from .plugins.base import NotifyBase from . import plugins from . import __version__ diff --git a/apprise/Apprise.pyi b/apprise/apprise.pyi similarity index 100% rename from apprise/Apprise.pyi rename to apprise/apprise.pyi diff --git a/apprise/AppriseAttachment.py b/apprise/apprise_attachment.py similarity index 98% rename from apprise/AppriseAttachment.py rename to apprise/apprise_attachment.py index fcfed3af..3c33f9e7 100644 --- a/apprise/AppriseAttachment.py +++ b/apprise/apprise_attachment.py @@ -27,9 +27,9 @@ # POSSIBILITY OF SUCH DAMAGE. from . import URLBase -from .attachment.AttachBase import AttachBase -from .AppriseAsset import AppriseAsset -from .AttachmentManager import AttachmentManager +from .attachment.base import AttachBase +from .asset import AppriseAsset +from .manager_attachment import AttachmentManager from .logger import logger from .common import ContentLocation from .common import CONTENT_LOCATIONS diff --git a/apprise/AppriseAttachment.pyi b/apprise/apprise_attachment.pyi similarity index 100% rename from apprise/AppriseAttachment.pyi rename to apprise/apprise_attachment.pyi diff --git a/apprise/AppriseConfig.py b/apprise/apprise_config.py similarity index 99% rename from apprise/AppriseConfig.py rename to apprise/apprise_config.py index 7e5a9126..080f70d3 100644 --- a/apprise/AppriseConfig.py +++ b/apprise/apprise_config.py @@ -28,9 +28,9 @@ from . import ConfigBase from . import CONFIG_FORMATS -from .ConfigurationManager import ConfigurationManager +from .manager_config import ConfigurationManager from . import URLBase -from .AppriseAsset import AppriseAsset +from .asset import AppriseAsset from . import common from .utils import GET_SCHEMA_RE from .utils import parse_list diff --git a/apprise/AppriseConfig.pyi b/apprise/apprise_config.pyi similarity index 100% rename from apprise/AppriseConfig.pyi rename to apprise/apprise_config.pyi diff --git a/apprise/AppriseAsset.py b/apprise/asset.py similarity index 99% rename from apprise/AppriseAsset.py rename to apprise/asset.py index 97a7bccf..450303d0 100644 --- a/apprise/AppriseAsset.py +++ b/apprise/asset.py @@ -33,7 +33,7 @@ from os.path import dirname from os.path import isfile from os.path import abspath from .common import NotifyType -from .NotificationManager import NotificationManager +from .manager_plugins import NotificationManager # Grant access to our Notification Manager Singleton diff --git a/apprise/AppriseAsset.pyi b/apprise/asset.pyi similarity index 100% rename from apprise/AppriseAsset.pyi rename to apprise/asset.pyi diff --git a/apprise/attachment/__init__.py b/apprise/attachment/__init__.py index 0a88313d..c2aef1ee 100644 --- a/apprise/attachment/__init__.py +++ b/apprise/attachment/__init__.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. # Used for testing -from .AttachBase import AttachBase -from ..AttachmentManager import AttachmentManager +from .base import AttachBase +from ..manager_attachment import AttachmentManager # Initalize our Attachment Manager Singleton A_MGR = AttachmentManager() @@ -36,4 +36,5 @@ A_MGR = AttachmentManager() __all__ = [ # Reference 'AttachBase', + 'AttachmentManager', ] diff --git a/apprise/attachment/AttachBase.py b/apprise/attachment/base.py similarity index 99% rename from apprise/attachment/AttachBase.py rename to apprise/attachment/base.py index 8cb6bd5c..fe8eb1bd 100644 --- a/apprise/attachment/AttachBase.py +++ b/apprise/attachment/base.py @@ -29,10 +29,10 @@ import os import time import mimetypes -from ..URLBase import URLBase +from ..url import URLBase from ..utils import parse_bool from ..common import ContentLocation -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class AttachBase(URLBase): diff --git a/apprise/attachment/AttachBase.pyi b/apprise/attachment/base.pyi similarity index 100% rename from apprise/attachment/AttachBase.pyi rename to apprise/attachment/base.pyi diff --git a/apprise/attachment/AttachFile.py b/apprise/attachment/file.py similarity index 98% rename from apprise/attachment/AttachFile.py rename to apprise/attachment/file.py index 4c9c8f13..c48a707a 100644 --- a/apprise/attachment/AttachFile.py +++ b/apprise/attachment/file.py @@ -28,9 +28,9 @@ import re import os -from .AttachBase import AttachBase +from .base import AttachBase from ..common import ContentLocation -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class AttachFile(AttachBase): diff --git a/apprise/attachment/AttachHTTP.py b/apprise/attachment/http.py similarity index 99% rename from apprise/attachment/AttachHTTP.py rename to apprise/attachment/http.py index 5a3af946..28bf55ca 100644 --- a/apprise/attachment/AttachHTTP.py +++ b/apprise/attachment/http.py @@ -31,10 +31,10 @@ import os import requests import threading from tempfile import NamedTemporaryFile -from .AttachBase import AttachBase +from .base import AttachBase from ..common import ContentLocation -from ..URLBase import PrivacyMode -from ..AppriseLocale import gettext_lazy as _ +from ..url import PrivacyMode +from ..locale import gettext_lazy as _ class AttachHTTP(AttachBase): diff --git a/apprise/config/__init__.py b/apprise/config/__init__.py index efbace68..24957e88 100644 --- a/apprise/config/__init__.py +++ b/apprise/config/__init__.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. # Used for testing -from .ConfigBase import ConfigBase -from ..ConfigurationManager import ConfigurationManager +from .base import ConfigBase +from ..manager_config import ConfigurationManager # Initalize our Config Manager Singleton C_MGR = ConfigurationManager() @@ -36,4 +36,5 @@ C_MGR = ConfigurationManager() __all__ = [ # Reference 'ConfigBase', + 'ConfigurationManager', ] diff --git a/apprise/config/ConfigBase.py b/apprise/config/base.py similarity index 99% rename from apprise/config/ConfigBase.py rename to apprise/config/base.py index 32e1bde3..953cee39 100644 --- a/apprise/config/ConfigBase.py +++ b/apprise/config/base.py @@ -33,15 +33,15 @@ import time from .. import plugins from .. import common -from ..AppriseAsset import AppriseAsset -from ..URLBase import URLBase -from ..ConfigurationManager import ConfigurationManager +from ..asset import AppriseAsset +from ..url import URLBase from ..utils import GET_SCHEMA_RE from ..utils import parse_list from ..utils import parse_bool from ..utils import parse_urls from ..utils import cwe312_url -from ..NotificationManager import NotificationManager +from ..manager_config import ConfigurationManager +from ..manager_plugins import NotificationManager # Test whether token is valid or not VALID_TOKEN = re.compile( diff --git a/apprise/config/ConfigBase.pyi b/apprise/config/base.pyi similarity index 100% rename from apprise/config/ConfigBase.pyi rename to apprise/config/base.pyi diff --git a/apprise/config/ConfigFile.py b/apprise/config/file.py similarity index 98% rename from apprise/config/ConfigFile.py rename to apprise/config/file.py index 172d699f..9f29ca20 100644 --- a/apprise/config/ConfigFile.py +++ b/apprise/config/file.py @@ -28,10 +28,10 @@ import re import os -from .ConfigBase import ConfigBase +from .base import ConfigBase from ..common import ConfigFormat from ..common import ContentIncludeMode -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class ConfigFile(ConfigBase): diff --git a/apprise/config/ConfigHTTP.py b/apprise/config/http.py similarity index 98% rename from apprise/config/ConfigHTTP.py rename to apprise/config/http.py index f6faba8d..2e2ba299 100644 --- a/apprise/config/ConfigHTTP.py +++ b/apprise/config/http.py @@ -28,11 +28,11 @@ import re import requests -from .ConfigBase import ConfigBase +from .base import ConfigBase from ..common import ConfigFormat from ..common import ContentIncludeMode -from ..URLBase import PrivacyMode -from ..AppriseLocale import gettext_lazy as _ +from ..url import PrivacyMode +from ..locale import gettext_lazy as _ # Support YAML formats # text/yaml diff --git a/apprise/config/ConfigMemory.py b/apprise/config/memory.py similarity index 97% rename from apprise/config/ConfigMemory.py rename to apprise/config/memory.py index 413956df..181d7623 100644 --- a/apprise/config/ConfigMemory.py +++ b/apprise/config/memory.py @@ -26,8 +26,8 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from .ConfigBase import ConfigBase -from ..AppriseLocale import gettext_lazy as _ +from .base import ConfigBase +from ..locale import gettext_lazy as _ class ConfigMemory(ConfigBase): diff --git a/apprise/conversion.py b/apprise/conversion.py index 4d5632f5..5b6d1a94 100644 --- a/apprise/conversion.py +++ b/apprise/conversion.py @@ -29,7 +29,7 @@ import re from markdown import markdown from .common import NotifyFormat -from .URLBase import URLBase +from .url import URLBase from html.parser import HTMLParser diff --git a/apprise/decorators/CustomNotifyPlugin.py b/apprise/decorators/base.py similarity index 98% rename from apprise/decorators/CustomNotifyPlugin.py rename to apprise/decorators/base.py index 40e6dff5..2661db0a 100644 --- a/apprise/decorators/CustomNotifyPlugin.py +++ b/apprise/decorators/base.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE.USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from ..plugins.NotifyBase import NotifyBase -from ..NotificationManager import NotificationManager +from ..plugins.base import NotifyBase +from ..manager_plugins import NotificationManager from ..utils import URL_DETAILS_RE from ..utils import parse_url from ..utils import url_assembly diff --git a/apprise/decorators/notify.py b/apprise/decorators/notify.py index 2dd5f509..892c3adf 100644 --- a/apprise/decorators/notify.py +++ b/apprise/decorators/notify.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from .CustomNotifyPlugin import CustomNotifyPlugin +from .base import CustomNotifyPlugin def notify(on, name=None): diff --git a/apprise/AppriseLocale.py b/apprise/locale.py similarity index 100% rename from apprise/AppriseLocale.py rename to apprise/locale.py diff --git a/apprise/manager.py b/apprise/manager.py index c2b715d4..70dc1070 100644 --- a/apprise/manager.py +++ b/apprise/manager.py @@ -61,6 +61,9 @@ class PluginManager(metaclass=Singleton): # The module path to scan module_path = join(abspath(dirname(__file__)), _id) + # For filtering our result when scanning a module + module_filter_re = re.compile(r'^(?P((?!_)[A-Za-z0-9]+))$') + # thread safe loading _lock = threading.Lock() @@ -177,7 +180,7 @@ class PluginManager(metaclass=Singleton): # The .py extension is optional as we support loading directories # too module_re = re.compile( - r'^(?P' + self.fname_prefix + r'[a-z0-9]+)(\.py)?$', + r'^(?P(?!base|_)[a-z0-9_]+)(\.py)?$', re.I) t_start = time.time() @@ -188,10 +191,6 @@ class PluginManager(metaclass=Singleton): # keep going continue - elif match.group('name') == f'{self.fname_prefix}Base': - # keep going - continue - # Store our notification/plugin name: module_name = match.group('name') module_pyname = '{}.{}'.format(module_name_prefix, module_name) @@ -216,7 +215,47 @@ class PluginManager(metaclass=Singleton): # logging found in import_module and not needed here continue - if not hasattr(module, module_name): + module_class = None + for m_class in [obj for obj in dir(module) + if self.module_filter_re.match(obj)]: + # Get our plugin + plugin = getattr(module, m_class) + if not hasattr(plugin, 'app_id'): + # Filter out non-notification modules + logger.trace( + "(%s) import failed; no app_id defined in %s", + self.name, m_class, os.path.join(module_path, f)) + continue + + # Add our plugin name to our module map + self._module_map[module_name] = { + 'plugin': set([plugin]), + 'module': module, + 'path': '{}.{}'.format( + module_name_prefix, module_name), + 'native': True, + } + + fn = getattr(plugin, 'schemas', None) + schemas = set([]) if not callable(fn) else fn(plugin) + + # map our schema to our plugin + for schema in schemas: + if schema in self._schema_map: + logger.error( + "{} schema ({}) mismatch detected - {} to {}" + .format(self.name, schema, self._schema_map, + plugin)) + continue + + # Assign plugin + self._schema_map[schema] = plugin + + # Store our class + module_class = m_class + break + + if not module_class: # Not a library we can load as it doesn't follow the simple # rule that the class must bear the same name as the # notification file itself. @@ -226,38 +265,6 @@ class PluginManager(metaclass=Singleton): self.name, module_name, os.path.join(module_path, f)) continue - # Get our plugin - plugin = getattr(module, module_name) - if not hasattr(plugin, 'app_id'): - # Filter out non-notification modules - logger.trace( - "(%s) import failed; no app_id defined in %s", - self.name, module_name, os.path.join(module_path, f)) - continue - - # Add our plugin name to our module map - self._module_map[module_name] = { - 'plugin': set([plugin]), - 'module': module, - 'path': '{}.{}'.format(module_name_prefix, module_name), - 'native': True, - } - - fn = getattr(plugin, 'schemas', None) - schemas = set([]) if not callable(fn) else fn(plugin) - - # map our schema to our plugin - for schema in schemas: - if schema in self._schema_map: - logger.error( - "{} schema ({}) mismatch detected - {} to {}" - .format(self.name, schema, self._schema_map, - plugin)) - continue - - # Assign plugin - self._schema_map[schema] = plugin - logger.trace( '{} {} loaded in {:.6f}s'.format( self.name, module_name, (time.time() - tl_start))) diff --git a/apprise/AttachmentManager.py b/apprise/manager_attachment.py similarity index 93% rename from apprise/AttachmentManager.py rename to apprise/manager_attachment.py index d296a499..d1288a94 100644 --- a/apprise/AttachmentManager.py +++ b/apprise/manager_attachment.py @@ -26,6 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. +import re from os.path import dirname from os.path import abspath from os.path import join @@ -52,3 +53,7 @@ class AttachmentManager(PluginManager): # The module path to scan module_path = join(abspath(dirname(__file__)), _id) + + # For filtering our result set + module_filter_re = re.compile( + r'^(?P' + fname_prefix + r'(?!Base)[A-Za-z0-9]+)$') diff --git a/apprise/ConfigurationManager.py b/apprise/manager_config.py similarity index 93% rename from apprise/ConfigurationManager.py rename to apprise/manager_config.py index 6696895b..69a6bedb 100644 --- a/apprise/ConfigurationManager.py +++ b/apprise/manager_config.py @@ -26,6 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. +import re from os.path import dirname from os.path import abspath from os.path import join @@ -52,3 +53,7 @@ class ConfigurationManager(PluginManager): # The module path to scan module_path = join(abspath(dirname(__file__)), _id) + + # For filtering our result set + module_filter_re = re.compile( + r'^(?P' + fname_prefix + r'(?!Base)[A-Za-z0-9]+)$') diff --git a/apprise/NotificationManager.py b/apprise/manager_plugins.py similarity index 92% rename from apprise/NotificationManager.py rename to apprise/manager_plugins.py index abbbdd20..74ed370e 100644 --- a/apprise/NotificationManager.py +++ b/apprise/manager_plugins.py @@ -26,6 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. +import re from os.path import dirname from os.path import abspath from os.path import join @@ -52,3 +53,8 @@ class NotificationManager(PluginManager): # The module path to scan module_path = join(abspath(dirname(__file__)), _id) + + # For filtering our result set + module_filter_re = re.compile( + r'^(?P' + fname_prefix + + r'(?!Base|ImageSize|Type)[A-Za-z0-9]+)$') diff --git a/apprise/plugins/__init__.py b/apprise/plugins/__init__.py index 72cb08fb..bfce1437 100644 --- a/apprise/plugins/__init__.py +++ b/apprise/plugins/__init__.py @@ -30,7 +30,7 @@ import os import copy # Used for testing -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NOTIFY_IMAGE_SIZES @@ -40,9 +40,9 @@ from ..utils import parse_list from ..utils import cwe312_url from ..utils import GET_SCHEMA_RE from ..logger import logger -from ..AppriseLocale import gettext_lazy as _ -from ..AppriseLocale import LazyTranslation -from ..NotificationManager import NotificationManager +from ..locale import gettext_lazy as _ +from ..locale import LazyTranslation +from ..manager_plugins import NotificationManager # Grant access to our Notification Manager Singleton diff --git a/apprise/plugins/NotifyAppriseAPI.py b/apprise/plugins/apprise_api.py similarity index 99% rename from apprise/plugins/NotifyAppriseAPI.py rename to apprise/plugins/apprise_api.py index 34c34a6d..cb7d6bfb 100644 --- a/apprise/plugins/NotifyAppriseAPI.py +++ b/apprise/plugins/apprise_api.py @@ -31,12 +31,12 @@ import requests from json import dumps import base64 -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class AppriseAPIMethod: diff --git a/apprise/plugins/NotifyAprs.py b/apprise/plugins/aprs.py similarity index 99% rename from apprise/plugins/NotifyAprs.py rename to apprise/plugins/aprs.py index 5d8c3c10..b8adef5a 100644 --- a/apprise/plugins/NotifyAprs.py +++ b/apprise/plugins/aprs.py @@ -70,9 +70,9 @@ import socket import sys from itertools import chain -from .NotifyBase import NotifyBase -from ..AppriseLocale import gettext_lazy as _ -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..locale import gettext_lazy as _ +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_call_sign from ..utils import parse_call_sign diff --git a/apprise/plugins/NotifyBark.py b/apprise/plugins/bark.py similarity index 99% rename from apprise/plugins/NotifyBark.py rename to apprise/plugins/bark.py index 781a1515..e2f5bbfb 100644 --- a/apprise/plugins/NotifyBark.py +++ b/apprise/plugins/bark.py @@ -32,13 +32,13 @@ import requests import json -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Sounds generated off of: https://github.com/Finb/Bark/tree/master/Sounds diff --git a/apprise/plugins/NotifyBase.py b/apprise/plugins/base.py similarity index 99% rename from apprise/plugins/NotifyBase.py rename to apprise/plugins/base.py index c29417c6..1abc3410 100644 --- a/apprise/plugins/NotifyBase.py +++ b/apprise/plugins/base.py @@ -30,7 +30,7 @@ import asyncio import re from functools import partial -from ..URLBase import URLBase +from ..url import URLBase from ..common import NotifyType from ..utils import parse_bool from ..common import NOTIFY_TYPES @@ -38,8 +38,8 @@ from ..common import NotifyFormat from ..common import NOTIFY_FORMATS from ..common import OverflowMode from ..common import OVERFLOW_MODES -from ..AppriseLocale import gettext_lazy as _ -from ..AppriseAttachment import AppriseAttachment +from ..locale import gettext_lazy as _ +from ..apprise_attachment import AppriseAttachment class NotifyBase(URLBase): diff --git a/apprise/plugins/NotifyBase.pyi b/apprise/plugins/base.pyi similarity index 100% rename from apprise/plugins/NotifyBase.pyi rename to apprise/plugins/base.pyi diff --git a/apprise/plugins/NotifyBoxcar.py b/apprise/plugins/boxcar.py similarity index 99% rename from apprise/plugins/NotifyBoxcar.py rename to apprise/plugins/boxcar.py index 808920ed..851cdd3d 100644 --- a/apprise/plugins/NotifyBoxcar.py +++ b/apprise/plugins/boxcar.py @@ -35,14 +35,14 @@ from hashlib import sha1 from itertools import chain from urllib.parse import urlparse -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..utils import parse_bool from ..utils import parse_list from ..utils import validate_regex from ..common import NotifyType from ..common import NotifyImageSize -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default to sending to all devices if nothing is specified DEFAULT_TAG = '@all' diff --git a/apprise/plugins/NotifyBulkSMS.py b/apprise/plugins/bulksms.py similarity index 99% rename from apprise/plugins/NotifyBulkSMS.py rename to apprise/plugins/bulksms.py index 33664fb0..29c4d7fa 100644 --- a/apprise/plugins/NotifyBulkSMS.py +++ b/apprise/plugins/bulksms.py @@ -36,13 +36,13 @@ import re import requests import json from itertools import chain -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ IS_GROUP_RE = re.compile( diff --git a/apprise/plugins/NotifyBulkVS.py b/apprise/plugins/bulkvs.py similarity index 99% rename from apprise/plugins/NotifyBulkVS.py rename to apprise/plugins/bulkvs.py index e912dff2..53a36300 100644 --- a/apprise/plugins/NotifyBulkVS.py +++ b/apprise/plugins/bulkvs.py @@ -35,13 +35,13 @@ # Messaging/post_messageSend import requests import json -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyBulkVS(NotifyBase): diff --git a/apprise/plugins/NotifyBurstSMS.py b/apprise/plugins/burstsms.py similarity index 99% rename from apprise/plugins/NotifyBurstSMS.py rename to apprise/plugins/burstsms.py index 39606abb..eb19df8e 100644 --- a/apprise/plugins/NotifyBurstSMS.py +++ b/apprise/plugins/burstsms.py @@ -33,14 +33,14 @@ # import requests -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class BurstSMSCountryCode: diff --git a/apprise/plugins/NotifyChantify.py b/apprise/plugins/chantify.py similarity index 98% rename from apprise/plugins/NotifyChantify.py rename to apprise/plugins/chantify.py index d912bd25..d549a59f 100644 --- a/apprise/plugins/NotifyChantify.py +++ b/apprise/plugins/chantify.py @@ -35,10 +35,10 @@ import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyChantify(NotifyBase): diff --git a/apprise/plugins/NotifyClickSend.py b/apprise/plugins/clicksend.py similarity index 98% rename from apprise/plugins/NotifyClickSend.py rename to apprise/plugins/clicksend.py index 5e345fe1..0c1f533f 100644 --- a/apprise/plugins/NotifyClickSend.py +++ b/apprise/plugins/clicksend.py @@ -43,13 +43,13 @@ import requests from json import dumps from base64 import b64encode -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages CLICKSEND_HTTP_ERROR_MAP = { diff --git a/apprise/plugins/NotifyForm.py b/apprise/plugins/custom_form.py similarity index 99% rename from apprise/plugins/NotifyForm.py rename to apprise/plugins/custom_form.py index 9690cd4f..0f36643f 100644 --- a/apprise/plugins/NotifyForm.py +++ b/apprise/plugins/custom_form.py @@ -29,11 +29,11 @@ import re import requests -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class FORMPayloadField: diff --git a/apprise/plugins/NotifyJSON.py b/apprise/plugins/custom_json.py similarity index 99% rename from apprise/plugins/NotifyJSON.py rename to apprise/plugins/custom_json.py index 182ff77c..e0d7a675 100644 --- a/apprise/plugins/NotifyJSON.py +++ b/apprise/plugins/custom_json.py @@ -30,11 +30,11 @@ import requests import base64 from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class JSONPayloadField: diff --git a/apprise/plugins/NotifyXML.py b/apprise/plugins/custom_xml.py similarity index 99% rename from apprise/plugins/NotifyXML.py rename to apprise/plugins/custom_xml.py index 21ccb79d..b7928fce 100644 --- a/apprise/plugins/NotifyXML.py +++ b/apprise/plugins/custom_xml.py @@ -30,11 +30,11 @@ import re import requests import base64 -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class XMLPayloadField: diff --git a/apprise/plugins/NotifyD7Networks.py b/apprise/plugins/d7networks.py similarity index 99% rename from apprise/plugins/NotifyD7Networks.py rename to apprise/plugins/d7networks.py index 906ec2fb..ad55e219 100644 --- a/apprise/plugins/NotifyD7Networks.py +++ b/apprise/plugins/d7networks.py @@ -39,13 +39,13 @@ import requests from json import dumps from json import loads -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages D7NETWORKS_HTTP_ERROR_MAP = { diff --git a/apprise/plugins/NotifyDapnet.py b/apprise/plugins/dapnet.py similarity index 99% rename from apprise/plugins/NotifyDapnet.py rename to apprise/plugins/dapnet.py index ae7199c9..60a18acd 100644 --- a/apprise/plugins/NotifyDapnet.py +++ b/apprise/plugins/dapnet.py @@ -51,9 +51,9 @@ from json import dumps import requests from requests.auth import HTTPBasicAuth -from .NotifyBase import NotifyBase -from ..AppriseLocale import gettext_lazy as _ -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..locale import gettext_lazy as _ +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_call_sign from ..utils import parse_call_sign diff --git a/apprise/plugins/NotifyDBus.py b/apprise/plugins/dbus.py similarity index 99% rename from apprise/plugins/NotifyDBus.py rename to apprise/plugins/dbus.py index 52e11981..f2361fd6 100644 --- a/apprise/plugins/NotifyDBus.py +++ b/apprise/plugins/dbus.py @@ -27,11 +27,11 @@ # POSSIBILITY OF SUCH DAMAGE. import sys -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default our global support flag NOTIFY_DBUS_SUPPORT_ENABLED = False diff --git a/apprise/plugins/NotifyDingTalk.py b/apprise/plugins/dingtalk.py similarity index 99% rename from apprise/plugins/NotifyDingTalk.py rename to apprise/plugins/dingtalk.py index d4a492fc..2ca1bc55 100644 --- a/apprise/plugins/NotifyDingTalk.py +++ b/apprise/plugins/dingtalk.py @@ -34,13 +34,13 @@ import base64 import requests from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Register at https://dingtalk.com # - Download their PC based software as it is the only way you can create diff --git a/apprise/plugins/NotifyDiscord.py b/apprise/plugins/discord.py similarity index 99% rename from apprise/plugins/NotifyDiscord.py rename to apprise/plugins/discord.py index 82d764f5..14c6152b 100644 --- a/apprise/plugins/NotifyDiscord.py +++ b/apprise/plugins/discord.py @@ -50,14 +50,14 @@ from datetime import timedelta from datetime import datetime from datetime import timezone -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ -from ..attachment.AttachBase import AttachBase +from ..locale import gettext_lazy as _ +from ..attachment.base import AttachBase # Used to detect user/role IDs diff --git a/apprise/plugins/NotifyEmail.py b/apprise/plugins/email.py similarity index 99% rename from apprise/plugins/NotifyEmail.py rename to apprise/plugins/email.py index 1b1b2fc1..142c93cf 100644 --- a/apprise/plugins/NotifyEmail.py +++ b/apprise/plugins/email.py @@ -41,12 +41,12 @@ from socket import error as SocketError from datetime import datetime from datetime import timezone -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyFormat, NotifyType from ..conversion import convert_between from ..utils import is_ipaddr, is_email, parse_emails, is_hostname -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from ..logger import logger # Globally Default encoding mode set to Quoted Printable. diff --git a/apprise/plugins/NotifyEmby.py b/apprise/plugins/emby.py similarity index 99% rename from apprise/plugins/NotifyEmby.py rename to apprise/plugins/emby.py index ce96553a..5e4e0b89 100644 --- a/apprise/plugins/NotifyEmby.py +++ b/apprise/plugins/emby.py @@ -34,12 +34,12 @@ import hashlib from json import dumps from json import loads -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..utils import parse_bool from ..common import NotifyType from .. import __version__ as VERSION -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyEmby(NotifyBase): diff --git a/apprise/plugins/NotifyEnigma2.py b/apprise/plugins/enigma2.py similarity index 98% rename from apprise/plugins/NotifyEnigma2.py rename to apprise/plugins/enigma2.py index 31314999..8b1fff68 100644 --- a/apprise/plugins/NotifyEnigma2.py +++ b/apprise/plugins/enigma2.py @@ -37,10 +37,10 @@ import requests from json import loads -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class Enigma2MessageType: diff --git a/apprise/plugins/NotifyFCM/__init__.py b/apprise/plugins/fcm/__init__.py similarity index 99% rename from apprise/plugins/NotifyFCM/__init__.py rename to apprise/plugins/fcm/__init__.py index 54b6c9cc..9dc0679f 100644 --- a/apprise/plugins/NotifyFCM/__init__.py +++ b/apprise/plugins/fcm/__init__.py @@ -50,15 +50,15 @@ # You will need this in order to send an apprise messag import requests from json import dumps -from ..NotifyBase import NotifyBase +from ..base import NotifyBase from ...common import NotifyType from ...utils import validate_regex from ...utils import parse_list from ...utils import parse_bool from ...utils import dict_full_update from ...common import NotifyImageSize -from ...AppriseAttachment import AppriseAttachment -from ...AppriseLocale import gettext_lazy as _ +from ...apprise_attachment import AppriseAttachment +from ...locale import gettext_lazy as _ from .common import (FCMMode, FCM_MODES) from .priority import (FCM_PRIORITIES, FCMPriorityManager) from .color import FCMColorManager diff --git a/apprise/plugins/NotifyFCM/color.py b/apprise/plugins/fcm/color.py similarity index 99% rename from apprise/plugins/NotifyFCM/color.py rename to apprise/plugins/fcm/color.py index c7da209a..20149eed 100644 --- a/apprise/plugins/NotifyFCM/color.py +++ b/apprise/plugins/fcm/color.py @@ -36,7 +36,7 @@ import re from ...utils import parse_bool from ...common import NotifyType -from ...AppriseAsset import AppriseAsset +from ...asset import AppriseAsset class FCMColorManager: diff --git a/apprise/plugins/NotifyFCM/common.py b/apprise/plugins/fcm/common.py similarity index 100% rename from apprise/plugins/NotifyFCM/common.py rename to apprise/plugins/fcm/common.py diff --git a/apprise/plugins/NotifyFCM/oauth.py b/apprise/plugins/fcm/oauth.py similarity index 100% rename from apprise/plugins/NotifyFCM/oauth.py rename to apprise/plugins/fcm/oauth.py diff --git a/apprise/plugins/NotifyFCM/priority.py b/apprise/plugins/fcm/priority.py similarity index 100% rename from apprise/plugins/NotifyFCM/priority.py rename to apprise/plugins/fcm/priority.py diff --git a/apprise/plugins/NotifyFeishu.py b/apprise/plugins/feishu.py similarity index 98% rename from apprise/plugins/NotifyFeishu.py rename to apprise/plugins/feishu.py index e6988333..961523ba 100644 --- a/apprise/plugins/NotifyFeishu.py +++ b/apprise/plugins/feishu.py @@ -36,10 +36,10 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyFeishu(NotifyBase): diff --git a/apprise/plugins/NotifyFlock.py b/apprise/plugins/flock.py similarity index 99% rename from apprise/plugins/NotifyFlock.py rename to apprise/plugins/flock.py index f1d12067..bf2cd131 100644 --- a/apprise/plugins/NotifyFlock.py +++ b/apprise/plugins/flock.py @@ -44,14 +44,14 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..common import NotifyImageSize from ..utils import parse_list from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages diff --git a/apprise/plugins/NotifyFreeMobile.py b/apprise/plugins/freemobile.py similarity index 98% rename from apprise/plugins/NotifyFreeMobile.py rename to apprise/plugins/freemobile.py index 2b460c13..4ff3d482 100644 --- a/apprise/plugins/NotifyFreeMobile.py +++ b/apprise/plugins/freemobile.py @@ -36,9 +36,9 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyFreeMobile(NotifyBase): diff --git a/apprise/plugins/NotifyGnome.py b/apprise/plugins/gnome.py similarity index 99% rename from apprise/plugins/NotifyGnome.py rename to apprise/plugins/gnome.py index 67129216..b64b5130 100644 --- a/apprise/plugins/NotifyGnome.py +++ b/apprise/plugins/gnome.py @@ -26,11 +26,11 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default our global support flag NOTIFY_GNOME_SUPPORT_ENABLED = False diff --git a/apprise/plugins/NotifyGoogleChat.py b/apprise/plugins/google_chat.py similarity index 99% rename from apprise/plugins/NotifyGoogleChat.py rename to apprise/plugins/google_chat.py index d2a6cc8a..f30cdae4 100644 --- a/apprise/plugins/NotifyGoogleChat.py +++ b/apprise/plugins/google_chat.py @@ -58,11 +58,11 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyFormat from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyGoogleChat(NotifyBase): diff --git a/apprise/plugins/NotifyGotify.py b/apprise/plugins/gotify.py similarity index 99% rename from apprise/plugins/NotifyGotify.py rename to apprise/plugins/gotify.py index 3f4ce132..bf6c1b28 100644 --- a/apprise/plugins/NotifyGotify.py +++ b/apprise/plugins/gotify.py @@ -34,10 +34,10 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType, NotifyFormat from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Priorities diff --git a/apprise/plugins/NotifyGrowl.py b/apprise/plugins/growl.py similarity index 99% rename from apprise/plugins/NotifyGrowl.py rename to apprise/plugins/growl.py index 0b42e3be..0b367218 100644 --- a/apprise/plugins/NotifyGrowl.py +++ b/apprise/plugins/growl.py @@ -26,12 +26,12 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default our global support flag NOTIFY_GROWL_SUPPORT_ENABLED = False diff --git a/apprise/plugins/NotifyGuilded.py b/apprise/plugins/guilded.py similarity index 96% rename from apprise/plugins/NotifyGuilded.py rename to apprise/plugins/guilded.py index 0ea36d9f..0ee07018 100644 --- a/apprise/plugins/NotifyGuilded.py +++ b/apprise/plugins/guilded.py @@ -45,10 +45,11 @@ # import re -from .NotifyDiscord import NotifyDiscord +# Import namespace so the class won't conflict with the actual Notify object +from . import discord -class NotifyGuilded(NotifyDiscord): +class NotifyGuilded(discord.NotifyDiscord): """ A wrapper to Guilded Notifications diff --git a/apprise/plugins/NotifyHomeAssistant.py b/apprise/plugins/home_assistant.py similarity index 98% rename from apprise/plugins/NotifyHomeAssistant.py rename to apprise/plugins/home_assistant.py index 0829381b..b0ffcaa6 100644 --- a/apprise/plugins/NotifyHomeAssistant.py +++ b/apprise/plugins/home_assistant.py @@ -34,11 +34,11 @@ from json import dumps from uuid import uuid4 -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyHomeAssistant(NotifyBase): diff --git a/apprise/plugins/NotifyHttpSMS.py b/apprise/plugins/httpsms.py similarity index 99% rename from apprise/plugins/NotifyHttpSMS.py rename to apprise/plugins/httpsms.py index 64710094..b36e286d 100644 --- a/apprise/plugins/NotifyHttpSMS.py +++ b/apprise/plugins/httpsms.py @@ -31,12 +31,12 @@ # https://httpsms.com import requests import json -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyHttpSMS(NotifyBase): diff --git a/apprise/plugins/NotifyIFTTT.py b/apprise/plugins/ifttt.py similarity index 99% rename from apprise/plugins/NotifyIFTTT.py rename to apprise/plugins/ifttt.py index 9174640d..9d89b146 100644 --- a/apprise/plugins/NotifyIFTTT.py +++ b/apprise/plugins/ifttt.py @@ -44,11 +44,11 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyIFTTT(NotifyBase): diff --git a/apprise/plugins/NotifyJoin.py b/apprise/plugins/join.py similarity index 99% rename from apprise/plugins/NotifyJoin.py rename to apprise/plugins/join.py index c6b0d91e..b92bb37a 100644 --- a/apprise/plugins/NotifyJoin.py +++ b/apprise/plugins/join.py @@ -39,13 +39,13 @@ import re import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages JOIN_HTTP_ERROR_MAP = { diff --git a/apprise/plugins/NotifyKavenegar.py b/apprise/plugins/kavenegar.py similarity index 99% rename from apprise/plugins/NotifyKavenegar.py rename to apprise/plugins/kavenegar.py index 2a9c169d..e4963f40 100644 --- a/apprise/plugins/NotifyKavenegar.py +++ b/apprise/plugins/kavenegar.py @@ -38,12 +38,12 @@ import requests from json import loads -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages # Based on https://kavenegar.com/rest.html diff --git a/apprise/plugins/NotifyKumulos.py b/apprise/plugins/kumulos.py similarity index 99% rename from apprise/plugins/NotifyKumulos.py rename to apprise/plugins/kumulos.py index da372e77..504dcc37 100644 --- a/apprise/plugins/NotifyKumulos.py +++ b/apprise/plugins/kumulos.py @@ -39,10 +39,10 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages KUMULOS_HTTP_ERROR_MAP = { diff --git a/apprise/plugins/NotifyLametric.py b/apprise/plugins/lametric.py similarity index 99% rename from apprise/plugins/NotifyLametric.py rename to apprise/plugins/lametric.py index 5825d917..411b9ea2 100644 --- a/apprise/plugins/NotifyLametric.py +++ b/apprise/plugins/lametric.py @@ -90,10 +90,10 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from ..utils import is_hostname from ..utils import is_ipaddr diff --git a/apprise/plugins/NotifyLine.py b/apprise/plugins/line.py similarity index 98% rename from apprise/plugins/NotifyLine.py rename to apprise/plugins/line.py index 61e4f370..07a01e76 100644 --- a/apprise/plugins/NotifyLine.py +++ b/apprise/plugins/line.py @@ -33,14 +33,14 @@ import requests import re from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..common import NotifyImageSize from ..utils import validate_regex from ..utils import parse_list from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Used to break path apart into list of streams diff --git a/apprise/plugins/NotifyLunaSea.py b/apprise/plugins/lunasea.py similarity index 99% rename from apprise/plugins/NotifyLunaSea.py rename to apprise/plugins/lunasea.py index 51d82091..2af51917 100644 --- a/apprise/plugins/NotifyLunaSea.py +++ b/apprise/plugins/lunasea.py @@ -33,15 +33,15 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyImageSize from ..utils import parse_list from ..utils import is_hostname from ..utils import is_ipaddr from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ -from ..URLBase import PrivacyMode +from ..locale import gettext_lazy as _ +from ..url import PrivacyMode class LunaSeaMode: diff --git a/apprise/plugins/NotifyMacOSX.py b/apprise/plugins/macosx.py similarity index 99% rename from apprise/plugins/NotifyMacOSX.py rename to apprise/plugins/macosx.py index dd53369f..31b7101b 100644 --- a/apprise/plugins/NotifyMacOSX.py +++ b/apprise/plugins/macosx.py @@ -30,11 +30,11 @@ import platform import subprocess import os -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default our global support flag NOTIFY_MACOSX_SUPPORT_ENABLED = False diff --git a/apprise/plugins/NotifyMailgun.py b/apprise/plugins/mailgun.py similarity index 99% rename from apprise/plugins/NotifyMailgun.py rename to apprise/plugins/mailgun.py index 82cf970b..69ab72dd 100644 --- a/apprise/plugins/NotifyMailgun.py +++ b/apprise/plugins/mailgun.py @@ -56,7 +56,7 @@ # import requests from email.utils import formataddr -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..utils import parse_emails @@ -64,7 +64,7 @@ from ..utils import parse_bool from ..utils import is_email from ..utils import validate_regex from ..logger import logger -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Provide some known codes Mailgun uses and what they translate to: # Based on https://documentation.mailgun.com/en/latest/api-intro.html#errors diff --git a/apprise/plugins/NotifyMastodon.py b/apprise/plugins/mastodon.py similarity index 99% rename from apprise/plugins/NotifyMastodon.py rename to apprise/plugins/mastodon.py index 0d2f27df..b6e451ad 100644 --- a/apprise/plugins/NotifyMastodon.py +++ b/apprise/plugins/mastodon.py @@ -33,16 +33,16 @@ from json import dumps, loads from datetime import datetime from datetime import timezone -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ -from ..attachment.AttachBase import AttachBase +from ..locale import gettext_lazy as _ +from ..attachment.base import AttachBase # Accept: # - @username diff --git a/apprise/plugins/NotifyMatrix.py b/apprise/plugins/matrix.py similarity index 99% rename from apprise/plugins/NotifyMatrix.py rename to apprise/plugins/matrix.py index 59427476..c1401f23 100644 --- a/apprise/plugins/NotifyMatrix.py +++ b/apprise/plugins/matrix.py @@ -37,8 +37,8 @@ from json import dumps from json import loads from time import time -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..common import NotifyImageSize from ..common import NotifyFormat @@ -46,7 +46,7 @@ from ..utils import parse_bool from ..utils import parse_list from ..utils import is_hostname from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Define default path MATRIX_V1_WEBHOOK_PATH = '/api/v1/matrix/hook' diff --git a/apprise/plugins/NotifyMattermost.py b/apprise/plugins/mattermost.py similarity index 99% rename from apprise/plugins/NotifyMattermost.py rename to apprise/plugins/mattermost.py index dbb5f0dd..481a9b85 100644 --- a/apprise/plugins/NotifyMattermost.py +++ b/apprise/plugins/mattermost.py @@ -39,13 +39,13 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Some Reference Locations: # - https://docs.mattermost.com/developer/webhooks-incoming.html diff --git a/apprise/plugins/NotifyMessageBird.py b/apprise/plugins/messagebird.py similarity index 99% rename from apprise/plugins/NotifyMessageBird.py rename to apprise/plugins/messagebird.py index 42d880ac..c496d347 100644 --- a/apprise/plugins/NotifyMessageBird.py +++ b/apprise/plugins/messagebird.py @@ -34,12 +34,12 @@ import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyMessageBird(NotifyBase): diff --git a/apprise/plugins/NotifyMisskey.py b/apprise/plugins/misskey.py similarity index 99% rename from apprise/plugins/NotifyMisskey.py rename to apprise/plugins/misskey.py index 8965a0f7..73b8f7c6 100644 --- a/apprise/plugins/NotifyMisskey.py +++ b/apprise/plugins/misskey.py @@ -47,10 +47,10 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class MisskeyVisibility: diff --git a/apprise/plugins/NotifyMQTT.py b/apprise/plugins/mqtt.py similarity index 99% rename from apprise/plugins/NotifyMQTT.py rename to apprise/plugins/mqtt.py index 49380d33..1e09cd14 100644 --- a/apprise/plugins/NotifyMQTT.py +++ b/apprise/plugins/mqtt.py @@ -38,12 +38,12 @@ import re from time import sleep from datetime import datetime from os.path import isfile -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default our global support flag NOTIFY_MQTT_SUPPORT_ENABLED = False diff --git a/apprise/plugins/NotifyMSG91.py b/apprise/plugins/msg91.py similarity index 99% rename from apprise/plugins/NotifyMSG91.py rename to apprise/plugins/msg91.py index a7bd9c47..28a5bf18 100644 --- a/apprise/plugins/NotifyMSG91.py +++ b/apprise/plugins/msg91.py @@ -38,12 +38,12 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no, parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class MSG91PayloadField: diff --git a/apprise/plugins/NotifyMSTeams.py b/apprise/plugins/msteams.py similarity index 99% rename from apprise/plugins/NotifyMSTeams.py rename to apprise/plugins/msteams.py index 06572c3e..2e0957f3 100644 --- a/apprise/plugins/NotifyMSTeams.py +++ b/apprise/plugins/msteams.py @@ -81,7 +81,7 @@ import requests import json from json.decoder import JSONDecodeError -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..common import NotifyFormat @@ -89,8 +89,8 @@ from ..utils import parse_bool from ..utils import validate_regex from ..utils import apply_template from ..utils import TemplateType -from ..AppriseAttachment import AppriseAttachment -from ..AppriseLocale import gettext_lazy as _ +from ..apprise_attachment import AppriseAttachment +from ..locale import gettext_lazy as _ class NotifyMSTeams(NotifyBase): diff --git a/apprise/plugins/NotifyNextcloud.py b/apprise/plugins/nextcloud.py similarity index 99% rename from apprise/plugins/NotifyNextcloud.py rename to apprise/plugins/nextcloud.py index fd471d9e..9acfc43d 100644 --- a/apprise/plugins/NotifyNextcloud.py +++ b/apprise/plugins/nextcloud.py @@ -28,11 +28,11 @@ import requests -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import parse_list -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyNextcloud(NotifyBase): diff --git a/apprise/plugins/NotifyNextcloudTalk.py b/apprise/plugins/nextcloudtalk.py similarity index 98% rename from apprise/plugins/NotifyNextcloudTalk.py rename to apprise/plugins/nextcloudtalk.py index 4bfced28..b1b01477 100644 --- a/apprise/plugins/NotifyNextcloudTalk.py +++ b/apprise/plugins/nextcloudtalk.py @@ -29,11 +29,11 @@ import requests from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import parse_list -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyNextcloudTalk(NotifyBase): diff --git a/apprise/plugins/NotifyNotica.py b/apprise/plugins/notica.py similarity index 99% rename from apprise/plugins/NotifyNotica.py rename to apprise/plugins/notica.py index 33a94fc9..661fde1d 100644 --- a/apprise/plugins/NotifyNotica.py +++ b/apprise/plugins/notica.py @@ -43,11 +43,11 @@ import re import requests -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NoticaMode: diff --git a/apprise/plugins/NotifyNotifiarr.py b/apprise/plugins/notifiarr.py similarity index 99% rename from apprise/plugins/NotifyNotifiarr.py rename to apprise/plugins/notifiarr.py index e195cbd3..cc13e1a5 100644 --- a/apprise/plugins/NotifyNotifiarr.py +++ b/apprise/plugins/notifiarr.py @@ -31,9 +31,9 @@ import requests from json import dumps from itertools import chain -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from ..common import NotifyImageSize from ..utils import parse_list, parse_bool from ..utils import validate_regex diff --git a/apprise/plugins/NotifyNotifico.py b/apprise/plugins/notifico.py similarity index 99% rename from apprise/plugins/NotifyNotifico.py rename to apprise/plugins/notifico.py index 27ce29a6..5cb0d666 100644 --- a/apprise/plugins/NotifyNotifico.py +++ b/apprise/plugins/notifico.py @@ -44,11 +44,11 @@ import re import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotificoFormat: diff --git a/apprise/plugins/NotifyNtfy.py b/apprise/plugins/ntfy.py similarity index 99% rename from apprise/plugins/NotifyNtfy.py rename to apprise/plugins/ntfy.py index 40834eec..805b8726 100644 --- a/apprise/plugins/NotifyNtfy.py +++ b/apprise/plugins/ntfy.py @@ -41,18 +41,18 @@ from json import loads from json import dumps from os.path import basename -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyFormat from ..common import NotifyType from ..common import NotifyImageSize -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from ..utils import parse_list from ..utils import parse_bool from ..utils import is_hostname from ..utils import is_ipaddr from ..utils import validate_regex -from ..URLBase import PrivacyMode -from ..attachment.AttachBase import AttachBase +from ..url import PrivacyMode +from ..attachment.base import AttachBase class NtfyMode: diff --git a/apprise/plugins/NotifyOffice365.py b/apprise/plugins/office365.py similarity index 99% rename from apprise/plugins/NotifyOffice365.py rename to apprise/plugins/office365.py index 0c62279f..b04f7a03 100644 --- a/apprise/plugins/NotifyOffice365.py +++ b/apprise/plugins/office365.py @@ -64,14 +64,14 @@ from datetime import datetime from datetime import timedelta from json import loads from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyFormat from ..common import NotifyType from ..utils import is_email from ..utils import parse_emails from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyOffice365(NotifyBase): diff --git a/apprise/plugins/NotifyOneSignal.py b/apprise/plugins/one_signal.py similarity index 99% rename from apprise/plugins/NotifyOneSignal.py rename to apprise/plugins/one_signal.py index eb1e10f7..76ec212f 100644 --- a/apprise/plugins/NotifyOneSignal.py +++ b/apprise/plugins/one_signal.py @@ -37,14 +37,14 @@ import requests from json import dumps from itertools import chain -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyImageSize from ..utils import validate_regex from ..utils import parse_list from ..utils import parse_bool from ..utils import is_email -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class OneSignalCategory: diff --git a/apprise/plugins/NotifyOpsgenie.py b/apprise/plugins/opsgenie.py similarity index 99% rename from apprise/plugins/NotifyOpsgenie.py rename to apprise/plugins/opsgenie.py index c2dfed23..5327ec80 100644 --- a/apprise/plugins/NotifyOpsgenie.py +++ b/apprise/plugins/opsgenie.py @@ -49,13 +49,13 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex from ..utils import is_uuid from ..utils import parse_list from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class OpsgenieCategory(NotifyBase): diff --git a/apprise/plugins/NotifyPagerDuty.py b/apprise/plugins/pagerduty.py similarity index 99% rename from apprise/plugins/NotifyPagerDuty.py rename to apprise/plugins/pagerduty.py index 0896b41b..c9d55552 100644 --- a/apprise/plugins/NotifyPagerDuty.py +++ b/apprise/plugins/pagerduty.py @@ -34,13 +34,13 @@ import requests from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..common import NotifyImageSize from ..utils import validate_regex from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class PagerDutySeverity: diff --git a/apprise/plugins/NotifyPagerTree.py b/apprise/plugins/pagertree.py similarity index 99% rename from apprise/plugins/NotifyPagerTree.py rename to apprise/plugins/pagertree.py index c9290f2f..8a041a35 100644 --- a/apprise/plugins/NotifyPagerTree.py +++ b/apprise/plugins/pagertree.py @@ -31,11 +31,11 @@ from json import dumps from uuid import uuid4 -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Actions diff --git a/apprise/plugins/NotifyParsePlatform.py b/apprise/plugins/parseplatform.py similarity index 99% rename from apprise/plugins/NotifyParsePlatform.py rename to apprise/plugins/parseplatform.py index 2a182ed3..cd59d057 100644 --- a/apprise/plugins/NotifyParsePlatform.py +++ b/apprise/plugins/parseplatform.py @@ -30,10 +30,10 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Used to break path apart into list of targets TARGET_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+') diff --git a/apprise/plugins/NotifyPopcornNotify.py b/apprise/plugins/popcorn_notify.py similarity index 99% rename from apprise/plugins/NotifyPopcornNotify.py rename to apprise/plugins/popcorn_notify.py index 0ecd8af6..388aa219 100644 --- a/apprise/plugins/NotifyPopcornNotify.py +++ b/apprise/plugins/popcorn_notify.py @@ -28,14 +28,14 @@ import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_email from ..utils import is_phone_no from ..utils import parse_list from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyPopcornNotify(NotifyBase): diff --git a/apprise/plugins/NotifyProwl.py b/apprise/plugins/prowl.py similarity index 99% rename from apprise/plugins/NotifyProwl.py rename to apprise/plugins/prowl.py index e5c07bf4..c174615c 100644 --- a/apprise/plugins/NotifyProwl.py +++ b/apprise/plugins/prowl.py @@ -28,10 +28,10 @@ import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Priorities diff --git a/apprise/plugins/NotifyPushBullet.py b/apprise/plugins/pushbullet.py similarity index 99% rename from apprise/plugins/NotifyPushBullet.py rename to apprise/plugins/pushbullet.py index 5e9c43fb..8e006db1 100644 --- a/apprise/plugins/NotifyPushBullet.py +++ b/apprise/plugins/pushbullet.py @@ -30,13 +30,13 @@ import requests from json import dumps from json import loads -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..utils import is_email from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ -from ..attachment.AttachBase import AttachBase +from ..locale import gettext_lazy as _ +from ..attachment.base import AttachBase # Flag used as a placeholder to sending to all devices PUSHBULLET_SEND_TO_ALL = 'ALL_DEVICES' diff --git a/apprise/plugins/NotifyPushDeer.py b/apprise/plugins/pushdeer.py similarity index 98% rename from apprise/plugins/NotifyPushDeer.py rename to apprise/plugins/pushdeer.py index 6766dc7f..fa888b15 100644 --- a/apprise/plugins/NotifyPushDeer.py +++ b/apprise/plugins/pushdeer.py @@ -29,9 +29,9 @@ import requests from ..common import NotifyType -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Syntax: # schan://{key}/ diff --git a/apprise/plugins/NotifyPushed.py b/apprise/plugins/pushed.py similarity index 99% rename from apprise/plugins/NotifyPushed.py rename to apprise/plugins/pushed.py index a50970f9..1ed83b9e 100644 --- a/apprise/plugins/NotifyPushed.py +++ b/apprise/plugins/pushed.py @@ -31,12 +31,12 @@ import requests from json import dumps from itertools import chain -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Used to detect and parse channels IS_CHANNEL = re.compile(r'^#?(?P[A-Za-z0-9]+)$') diff --git a/apprise/plugins/NotifyPushjet.py b/apprise/plugins/pushjet.py similarity index 98% rename from apprise/plugins/NotifyPushjet.py rename to apprise/plugins/pushjet.py index 253ac681..f8dcfdf3 100644 --- a/apprise/plugins/NotifyPushjet.py +++ b/apprise/plugins/pushjet.py @@ -29,11 +29,11 @@ import requests from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyPushjet(NotifyBase): diff --git a/apprise/plugins/NotifyPushMe.py b/apprise/plugins/pushme.py similarity index 98% rename from apprise/plugins/NotifyPushMe.py rename to apprise/plugins/pushme.py index 30889f86..abbed794 100644 --- a/apprise/plugins/NotifyPushMe.py +++ b/apprise/plugins/pushme.py @@ -28,12 +28,12 @@ import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..utils import validate_regex from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyPushMe(NotifyBase): diff --git a/apprise/plugins/NotifyPushover.py b/apprise/plugins/pushover.py similarity index 99% rename from apprise/plugins/NotifyPushover.py rename to apprise/plugins/pushover.py index be6ada28..954e7dd0 100644 --- a/apprise/plugins/NotifyPushover.py +++ b/apprise/plugins/pushover.py @@ -30,14 +30,14 @@ import re import requests from itertools import chain -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..conversion import convert_between from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ -from ..attachment.AttachBase import AttachBase +from ..locale import gettext_lazy as _ +from ..attachment.base import AttachBase # Flag used as a placeholder to sending to all devices PUSHOVER_SEND_TO_ALL = 'ALL_DEVICES' diff --git a/apprise/plugins/NotifyPushSafer.py b/apprise/plugins/pushsafer.py similarity index 99% rename from apprise/plugins/NotifyPushSafer.py rename to apprise/plugins/pushsafer.py index 32cfa82f..7bdca7a6 100644 --- a/apprise/plugins/NotifyPushSafer.py +++ b/apprise/plugins/pushsafer.py @@ -30,11 +30,11 @@ import base64 import requests from json import loads -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class PushSaferSound: diff --git a/apprise/plugins/NotifyPushy.py b/apprise/plugins/pushy.py similarity index 99% rename from apprise/plugins/NotifyPushy.py rename to apprise/plugins/pushy.py index 097017da..bb2a24ec 100644 --- a/apprise/plugins/NotifyPushy.py +++ b/apprise/plugins/pushy.py @@ -32,11 +32,11 @@ import requests from itertools import chain from json import dumps, loads -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Used to detect a Device and Topic VALIDATE_DEVICE = re.compile(r'^@(?P[a-z0-9]+)$', re.I) diff --git a/apprise/plugins/NotifyReddit.py b/apprise/plugins/reddit.py similarity index 99% rename from apprise/plugins/NotifyReddit.py rename to apprise/plugins/reddit.py index 022a0a50..3a60b5e0 100644 --- a/apprise/plugins/NotifyReddit.py +++ b/apprise/plugins/reddit.py @@ -53,14 +53,14 @@ from datetime import timedelta from datetime import datetime from datetime import timezone -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from .. import __title__, __version__ # Extend HTTP Error Messages diff --git a/apprise/plugins/NotifyRevolt.py b/apprise/plugins/revolt.py similarity index 99% rename from apprise/plugins/NotifyRevolt.py rename to apprise/plugins/revolt.py index ae0a43b1..1f518540 100644 --- a/apprise/plugins/NotifyRevolt.py +++ b/apprise/plugins/revolt.py @@ -42,13 +42,13 @@ from datetime import timedelta from datetime import datetime from datetime import timezone -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyFormat from ..common import NotifyType from ..utils import validate_regex from ..utils import parse_list -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyRevolt(NotifyBase): diff --git a/apprise/plugins/NotifyRocketChat.py b/apprise/plugins/rocketchat.py similarity index 99% rename from apprise/plugins/NotifyRocketChat.py rename to apprise/plugins/rocketchat.py index 9011a5e7..973651e3 100644 --- a/apprise/plugins/NotifyRocketChat.py +++ b/apprise/plugins/rocketchat.py @@ -32,14 +32,14 @@ from json import loads from json import dumps from itertools import chain -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyImageSize from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ IS_CHANNEL = re.compile(r'^#(?P[A-Za-z0-9_-]+)$') IS_USER = re.compile(r'^@(?P[A-Za-z0-9._-]+)$') diff --git a/apprise/plugins/NotifyRSyslog.py b/apprise/plugins/rsyslog.py similarity index 99% rename from apprise/plugins/NotifyRSyslog.py rename to apprise/plugins/rsyslog.py index e3974462..9631c72f 100644 --- a/apprise/plugins/NotifyRSyslog.py +++ b/apprise/plugins/rsyslog.py @@ -29,10 +29,10 @@ import os import socket -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class syslog: diff --git a/apprise/plugins/NotifyRyver.py b/apprise/plugins/ryver.py similarity index 99% rename from apprise/plugins/NotifyRyver.py rename to apprise/plugins/ryver.py index 0872f3e5..114dc6a0 100644 --- a/apprise/plugins/NotifyRyver.py +++ b/apprise/plugins/ryver.py @@ -38,12 +38,12 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class RyverWebhookMode: diff --git a/apprise/plugins/NotifySendGrid.py b/apprise/plugins/sendgrid.py similarity index 99% rename from apprise/plugins/NotifySendGrid.py rename to apprise/plugins/sendgrid.py index b82e3e60..d50839f1 100644 --- a/apprise/plugins/NotifySendGrid.py +++ b/apprise/plugins/sendgrid.py @@ -49,13 +49,13 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_list from ..utils import is_email from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages SENDGRID_HTTP_ERROR_MAP = { diff --git a/apprise/plugins/NotifyServerChan.py b/apprise/plugins/serverchan.py similarity index 98% rename from apprise/plugins/NotifyServerChan.py rename to apprise/plugins/serverchan.py index cf250cf5..e3abaa35 100644 --- a/apprise/plugins/NotifyServerChan.py +++ b/apprise/plugins/serverchan.py @@ -30,9 +30,9 @@ import re import requests from ..common import NotifyType -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Register at https://sct.ftqq.com/ diff --git a/apprise/plugins/NotifySES.py b/apprise/plugins/ses.py similarity index 99% rename from apprise/plugins/NotifySES.py rename to apprise/plugins/ses.py index b580b14d..5a2c047a 100644 --- a/apprise/plugins/NotifySES.py +++ b/apprise/plugins/ses.py @@ -95,13 +95,13 @@ from email.utils import formataddr from email.header import Header from urllib.parse import quote -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_emails from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from ..utils import is_email # Our Regin Identifier diff --git a/apprise/plugins/NotifySignalAPI.py b/apprise/plugins/signal_api.py similarity index 99% rename from apprise/plugins/NotifySignalAPI.py rename to apprise/plugins/signal_api.py index b35b4989..7e557133 100644 --- a/apprise/plugins/NotifySignalAPI.py +++ b/apprise/plugins/signal_api.py @@ -31,13 +31,13 @@ import requests from json import dumps import base64 -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool -from ..URLBase import PrivacyMode -from ..AppriseLocale import gettext_lazy as _ +from ..url import PrivacyMode +from ..locale import gettext_lazy as _ GROUP_REGEX = re.compile( diff --git a/apprise/plugins/NotifySimplePush.py b/apprise/plugins/simplepush.py similarity index 98% rename from apprise/plugins/NotifySimplePush.py rename to apprise/plugins/simplepush.py index 3851e1e3..10b01b0f 100644 --- a/apprise/plugins/NotifySimplePush.py +++ b/apprise/plugins/simplepush.py @@ -30,11 +30,11 @@ from os import urandom from json import loads import requests -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ from base64 import urlsafe_b64encode import hashlib diff --git a/apprise/plugins/NotifySinch.py b/apprise/plugins/sinch.py similarity index 99% rename from apprise/plugins/NotifySinch.py rename to apprise/plugins/sinch.py index 74b3c452..06bd5b1e 100644 --- a/apprise/plugins/NotifySinch.py +++ b/apprise/plugins/sinch.py @@ -39,13 +39,13 @@ import requests import json -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class SinchRegion: diff --git a/apprise/plugins/NotifySlack.py b/apprise/plugins/slack.py similarity index 99% rename from apprise/plugins/NotifySlack.py rename to apprise/plugins/slack.py index b66fe99f..b929dfb4 100644 --- a/apprise/plugins/NotifySlack.py +++ b/apprise/plugins/slack.py @@ -78,7 +78,7 @@ from json import dumps from json import loads from time import time -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..common import NotifyFormat @@ -86,7 +86,7 @@ from ..utils import is_email from ..utils import parse_bool from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages SLACK_HTTP_ERROR_MAP = { diff --git a/apprise/plugins/NotifySMSEagle.py b/apprise/plugins/smseagle.py similarity index 99% rename from apprise/plugins/NotifySMSEagle.py rename to apprise/plugins/smseagle.py index 33b4af75..8eddca58 100644 --- a/apprise/plugins/NotifySMSEagle.py +++ b/apprise/plugins/smseagle.py @@ -32,14 +32,14 @@ from json import dumps, loads import base64 from itertools import chain -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool -from ..URLBase import PrivacyMode -from ..AppriseLocale import gettext_lazy as _ +from ..url import PrivacyMode +from ..locale import gettext_lazy as _ GROUP_REGEX = re.compile( diff --git a/apprise/plugins/NotifySMSManager.py b/apprise/plugins/smsmanager.py similarity index 99% rename from apprise/plugins/NotifySMSManager.py rename to apprise/plugins/smsmanager.py index efc158b6..1d352daf 100644 --- a/apprise/plugins/NotifySMSManager.py +++ b/apprise/plugins/smsmanager.py @@ -35,13 +35,13 @@ # 2. Generate an API key in web administration. import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class SMSManagerGateway(object): diff --git a/apprise/plugins/NotifySMTP2Go.py b/apprise/plugins/smtp2go.py similarity index 99% rename from apprise/plugins/NotifySMTP2Go.py rename to apprise/plugins/smtp2go.py index a34492d0..017da811 100644 --- a/apprise/plugins/NotifySMTP2Go.py +++ b/apprise/plugins/smtp2go.py @@ -49,14 +49,14 @@ import base64 import requests from json import dumps from email.utils import formataddr -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..utils import parse_emails from ..utils import parse_bool from ..utils import is_email from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ SMTP2GO_HTTP_ERROR_MAP = { 429: 'To many requests.', diff --git a/apprise/plugins/NotifySNS.py b/apprise/plugins/sns.py similarity index 99% rename from apprise/plugins/NotifySNS.py rename to apprise/plugins/sns.py index 5a287e37..cc6e8307 100644 --- a/apprise/plugins/NotifySNS.py +++ b/apprise/plugins/sns.py @@ -36,13 +36,13 @@ from collections import OrderedDict from xml.etree import ElementTree from itertools import chain -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Topic Detection # Summary: 256 Characters max, only alpha/numeric plus underscore (_) and diff --git a/apprise/plugins/NotifySparkPost.py b/apprise/plugins/sparkpost.py similarity index 99% rename from apprise/plugins/NotifySparkPost.py rename to apprise/plugins/sparkpost.py index 255db070..b873d6b0 100644 --- a/apprise/plugins/NotifySparkPost.py +++ b/apprise/plugins/sparkpost.py @@ -58,7 +58,7 @@ import requests import base64 from json import loads from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..utils import is_email @@ -66,7 +66,7 @@ from email.utils import formataddr from ..utils import validate_regex from ..utils import parse_emails from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Provide some known codes SparkPost uses and what they translate to: # Based on https://www.sparkpost.com/docs/tech-resources/extended-error-codes/ diff --git a/apprise/plugins/NotifyStreamlabs.py b/apprise/plugins/streamlabs.py similarity index 99% rename from apprise/plugins/NotifyStreamlabs.py rename to apprise/plugins/streamlabs.py index d1e4186a..c534f1ba 100644 --- a/apprise/plugins/NotifyStreamlabs.py +++ b/apprise/plugins/streamlabs.py @@ -38,10 +38,10 @@ # import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # calls diff --git a/apprise/plugins/NotifySynology.py b/apprise/plugins/synology.py similarity index 98% rename from apprise/plugins/NotifySynology.py rename to apprise/plugins/synology.py index be58c064..ed85f80c 100644 --- a/apprise/plugins/NotifySynology.py +++ b/apprise/plugins/synology.py @@ -29,10 +29,10 @@ import requests from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # For API Details see: # https://kb.synology.com/en-au/DSM/help/Chat/chat_integration diff --git a/apprise/plugins/NotifySyslog.py b/apprise/plugins/syslog.py similarity index 99% rename from apprise/plugins/NotifySyslog.py rename to apprise/plugins/syslog.py index 5540fc75..935111ee 100644 --- a/apprise/plugins/NotifySyslog.py +++ b/apprise/plugins/syslog.py @@ -28,10 +28,10 @@ import syslog -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class SyslogFacility: diff --git a/apprise/plugins/NotifyTechulusPush.py b/apprise/plugins/techuluspush.py similarity index 98% rename from apprise/plugins/NotifyTechulusPush.py rename to apprise/plugins/techuluspush.py index 4d0b9934..682bf088 100644 --- a/apprise/plugins/NotifyTechulusPush.py +++ b/apprise/plugins/techuluspush.py @@ -53,10 +53,10 @@ import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Token required as part of the API request # Used to prepare our UUID regex matching diff --git a/apprise/plugins/NotifyTelegram.py b/apprise/plugins/telegram.py similarity index 99% rename from apprise/plugins/NotifyTelegram.py rename to apprise/plugins/telegram.py index cce8af62..6b997f57 100644 --- a/apprise/plugins/NotifyTelegram.py +++ b/apprise/plugins/telegram.py @@ -59,15 +59,15 @@ import os from json import loads from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyImageSize from ..common import NotifyFormat from ..utils import parse_bool from ..utils import parse_list from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ -from ..attachment.AttachBase import AttachBase +from ..locale import gettext_lazy as _ +from ..attachment.base import AttachBase TELEGRAM_IMAGE_XY = NotifyImageSize.XY_256 diff --git a/apprise/plugins/NotifyThreema.py b/apprise/plugins/threema.py similarity index 99% rename from apprise/plugins/NotifyThreema.py rename to apprise/plugins/threema.py index c2ad82e2..423c2312 100644 --- a/apprise/plugins/NotifyThreema.py +++ b/apprise/plugins/threema.py @@ -35,14 +35,14 @@ import requests from itertools import chain -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import validate_regex from ..utils import is_email -from ..URLBase import PrivacyMode +from ..url import PrivacyMode from ..utils import parse_list -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class ThreemaRecipientTypes: diff --git a/apprise/plugins/NotifyTwilio.py b/apprise/plugins/twilio.py similarity index 99% rename from apprise/plugins/NotifyTwilio.py rename to apprise/plugins/twilio.py index 863b09a9..4205e37f 100644 --- a/apprise/plugins/NotifyTwilio.py +++ b/apprise/plugins/twilio.py @@ -46,13 +46,13 @@ import requests from json import loads -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyTwilio(NotifyBase): diff --git a/apprise/plugins/NotifyTwist.py b/apprise/plugins/twist.py similarity index 99% rename from apprise/plugins/NotifyTwist.py rename to apprise/plugins/twist.py index fa26feb8..62d729f4 100644 --- a/apprise/plugins/NotifyTwist.py +++ b/apprise/plugins/twist.py @@ -35,13 +35,13 @@ import requests from json import loads from itertools import chain -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyFormat from ..common import NotifyType from ..utils import parse_list from ..utils import is_email -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # A workspace can also be interpreted as a team name too! diff --git a/apprise/plugins/NotifyTwitter.py b/apprise/plugins/twitter.py similarity index 99% rename from apprise/plugins/NotifyTwitter.py rename to apprise/plugins/twitter.py index 7a0813c1..8000a815 100644 --- a/apprise/plugins/NotifyTwitter.py +++ b/apprise/plugins/twitter.py @@ -36,14 +36,14 @@ from datetime import timezone from requests_oauthlib import OAuth1 from json import dumps from json import loads -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import parse_list from ..utils import parse_bool from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ -from ..attachment.AttachBase import AttachBase +from ..locale import gettext_lazy as _ +from ..attachment.base import AttachBase IS_USER = re.compile(r'^\s*@?(?P[A-Z0-9_]+)$', re.I) diff --git a/apprise/plugins/NotifyVoipms.py b/apprise/plugins/voipms.py similarity index 99% rename from apprise/plugins/NotifyVoipms.py rename to apprise/plugins/voipms.py index a023589a..3a4e6d25 100644 --- a/apprise/plugins/NotifyVoipms.py +++ b/apprise/plugins/voipms.py @@ -37,12 +37,12 @@ import requests from json import loads -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import is_email from ..utils import parse_phone_no -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyVoipms(NotifyBase): diff --git a/apprise/plugins/NotifyVonage.py b/apprise/plugins/vonage.py similarity index 99% rename from apprise/plugins/NotifyVonage.py rename to apprise/plugins/vonage.py index e9b1422a..441a6ba6 100644 --- a/apprise/plugins/NotifyVonage.py +++ b/apprise/plugins/vonage.py @@ -33,13 +33,13 @@ # import requests -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyVonage(NotifyBase): diff --git a/apprise/plugins/NotifyWebexTeams.py b/apprise/plugins/webexteams.py similarity index 99% rename from apprise/plugins/NotifyWebexTeams.py rename to apprise/plugins/webexteams.py index c91864ba..bd0bdb57 100644 --- a/apprise/plugins/NotifyWebexTeams.py +++ b/apprise/plugins/webexteams.py @@ -63,11 +63,11 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..common import NotifyFormat from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Extend HTTP Error Messages # Based on: https://developer.webex.com/docs/api/basics/rate-limiting diff --git a/apprise/plugins/NotifyWeComBot.py b/apprise/plugins/wecombot.py similarity index 99% rename from apprise/plugins/NotifyWeComBot.py rename to apprise/plugins/wecombot.py index 4289b39e..ab634171 100644 --- a/apprise/plugins/NotifyWeComBot.py +++ b/apprise/plugins/wecombot.py @@ -59,10 +59,10 @@ import re import requests from json import dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyWeComBot(NotifyBase): diff --git a/apprise/plugins/NotifyWhatsApp.py b/apprise/plugins/whatsapp.py similarity index 99% rename from apprise/plugins/NotifyWhatsApp.py rename to apprise/plugins/whatsapp.py index 4ccbcbda..7120d736 100644 --- a/apprise/plugins/NotifyWhatsApp.py +++ b/apprise/plugins/whatsapp.py @@ -44,12 +44,12 @@ import re import requests from json import loads, dumps -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import is_phone_no from ..utils import parse_phone_no from ..utils import validate_regex -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyWhatsApp(NotifyBase): diff --git a/apprise/plugins/NotifyWindows.py b/apprise/plugins/windows.py similarity index 99% rename from apprise/plugins/NotifyWindows.py rename to apprise/plugins/windows.py index 207e0f22..746fcd1d 100644 --- a/apprise/plugins/NotifyWindows.py +++ b/apprise/plugins/windows.py @@ -28,11 +28,11 @@ from time import sleep -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyImageSize from ..common import NotifyType from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # Default our global support flag NOTIFY_WINDOWS_SUPPORT_ENABLED = False diff --git a/apprise/plugins/NotifyXBMC.py b/apprise/plugins/xbmc.py similarity index 99% rename from apprise/plugins/NotifyXBMC.py rename to apprise/plugins/xbmc.py index 7d4462e4..8006e100 100644 --- a/apprise/plugins/NotifyXBMC.py +++ b/apprise/plugins/xbmc.py @@ -29,12 +29,12 @@ import requests from json import dumps -from .NotifyBase import NotifyBase -from ..URLBase import PrivacyMode +from .base import NotifyBase +from ..url import PrivacyMode from ..common import NotifyType from ..common import NotifyImageSize from ..utils import parse_bool -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ class NotifyXBMC(NotifyBase): diff --git a/apprise/plugins/NotifyZulip.py b/apprise/plugins/zulip.py similarity index 99% rename from apprise/plugins/NotifyZulip.py rename to apprise/plugins/zulip.py index 54fe2d06..e829e6f6 100644 --- a/apprise/plugins/NotifyZulip.py +++ b/apprise/plugins/zulip.py @@ -61,13 +61,13 @@ import re import requests -from .NotifyBase import NotifyBase +from .base import NotifyBase from ..common import NotifyType from ..utils import parse_list from ..utils import validate_regex from ..utils import is_email from ..utils import remove_suffix -from ..AppriseLocale import gettext_lazy as _ +from ..locale import gettext_lazy as _ # A Valid Bot Name VALIDATE_BOTNAME = re.compile(r'(?P[A-Z0-9_-]{1,32})', re.I) diff --git a/apprise/URLBase.py b/apprise/url.py similarity index 99% rename from apprise/URLBase.py rename to apprise/url.py index 90ea85c6..72fc1b5d 100644 --- a/apprise/URLBase.py +++ b/apprise/url.py @@ -35,8 +35,8 @@ from xml.sax.saxutils import escape as sax_escape from urllib.parse import unquote as _unquote from urllib.parse import quote as _quote -from .AppriseLocale import gettext_lazy as _ -from .AppriseAsset import AppriseAsset +from .locale import gettext_lazy as _ +from .asset import AppriseAsset from .utils import urlencode from .utils import parse_url from .utils import parse_bool diff --git a/apprise/URLBase.pyi b/apprise/url.pyi similarity index 100% rename from apprise/URLBase.pyi rename to apprise/url.pyi diff --git a/test/conftest.py b/test/conftest.py index f29b0db6..84b0008b 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -31,9 +31,9 @@ import os import pytest -from apprise.NotificationManager import NotificationManager -from apprise.ConfigurationManager import ConfigurationManager -from apprise.AttachmentManager import AttachmentManager +from apprise.manager_plugins import NotificationManager +from apprise.manager_config import ConfigurationManager +from apprise.manager_attachment import AttachmentManager sys.path.append(os.path.join(os.path.dirname(__file__), 'helpers')) diff --git a/test/helpers/module.py b/test/helpers/module.py index ec9d6101..a870a78c 100644 --- a/test/helpers/module.py +++ b/test/helpers/module.py @@ -28,8 +28,8 @@ from itertools import chain from importlib import import_module, reload -from apprise.NotificationManager import NotificationManager -from apprise.AttachmentManager import AttachmentManager +from apprise.manager_plugins import NotificationManager +from apprise.manager_attachment import AttachmentManager import sys import re @@ -39,6 +39,14 @@ N_MGR = NotificationManager() # Grant access to our Attachment Manager Singleton A_MGR = AttachmentManager() +# For filtering our result when scanning a module +# Identify any items below we should match on that we can freely +# directly copy around between our modules. This should only +# catch class/function/variables we want to allow explicity +# copy/paste access with +module_filter_re = \ + re.compile(r'^(?P(Notify|Config|Attach)[A-Za-z0-9]+)$') + def reload_plugin(name): """ @@ -52,42 +60,71 @@ def reload_plugin(name): A_MGR.unload_modules() - reload(sys.modules['apprise.attachment.AttachBase']) - reload(sys.modules['apprise.AppriseAttachment']) - new_apprise_attachment_mod = import_module('apprise.AppriseAttachment') - reload(sys.modules['apprise.AttachmentManager']) + reload(sys.modules['apprise.apprise_attachment']) + reload(sys.modules['apprise.attachment.base']) + new_apprise_attachment_mod = import_module('apprise.apprise_attachment') + new_apprise_attach_base_mod = import_module('apprise.attachment.base') + reload(sys.modules['apprise.manager_attachment']) module_pyname = '{}.{}'.format(N_MGR.module_name_prefix, name) if module_pyname in sys.modules: reload(sys.modules[module_pyname]) new_notify_mod = import_module(module_pyname) - reload(sys.modules['apprise.NotificationManager']) - reload(sys.modules['apprise.Apprise']) + # Detect our class object + class_matches = {} + for class_name in [obj for obj in dir(new_notify_mod) + if module_filter_re.match(obj)]: + + # Store our entry + class_matches[class_name] = getattr(new_notify_mod, class_name) + + # the user running the tests did not correctly use reload_plugin() or + # they did, but libraries around them have shifted. We need to error out + # so the test can be fixed + if not class_matches: + raise AttributeError(f"Module {name} has no URLBase defined in it!") + + reload(sys.modules['apprise.manager_plugins']) + reload(sys.modules['apprise.apprise']) reload(sys.modules['apprise.utils']) + reload(sys.modules['apprise.locale']) reload(sys.modules['apprise']) - # Filter our keys + # Acquire all of the test files we have tests = [k for k in sys.modules.keys() if re.match(r'^test_.+$', k)] + + # Iterate over all of our test modules for module_name in tests: + # Filter the test files by only those using the class_name we found + # within our module possible_matches = \ [m for m in dir(sys.modules[module_name]) - if re.match(r'^(?PNotify[a-z0-9]+)$', m, re.I)] + if re.match('^(?P{})$'.format( + '|'.join(class_matches.keys())), m)] if not possible_matches: continue + # if we get here, we have test_ files that utilize the Class we just + # reloaded + # Fix reference to new plugin class in given module. # Needed for updating the module-level import reference like # `from apprise.plugins.NotifyABCDE import NotifyABCDE`. # # We reload NotifyABCDE and place it back in its spot test_mod = import_module(module_name) - setattr(test_mod, name, getattr(new_notify_mod, name)) + for class_name, class_plugin in class_matches.items(): + if hasattr(test_mod, class_name): + setattr(test_mod, class_name, class_plugin) + # + # This section below reloads our attachment classes + # # Detect our Apprise Modules (include helpers) apprise_modules = \ - [k for k in sys.modules.keys() - if re.match(r'^(apprise|helpers)(\.|.+)$', k)] + sorted([k for k in sys.modules.keys() + if re.match(r'^(apprise|helpers)(\.|.+)$', k)], reverse=True) for entry in A_MGR: reload(sys.modules[entry['path']]) @@ -104,7 +141,7 @@ def reload_plugin(name): apprise_mod = import_module(module_pyname) # Fix reference to new plugin class in given module. # Needed for updating the module-level import reference - # like `from apprise. import NotifyABCDE`. + # like `from apprise. import AttachABCDE`. # # We reload NotifyABCDE and place it back in its spot # new_attach = import_module(entry['path']) @@ -114,8 +151,25 @@ def reload_plugin(name): apprise_mod, name, getattr(new_apprise_attachment_mod, name)) + elif name == 'AttachBase': + setattr( + apprise_mod, name, + getattr(new_apprise_attach_base_mod, name)) + else: module_pyname = '{}.{}'.format( A_MGR.module_name_prefix, name) new_attach_mod = import_module(module_pyname) - setattr(apprise_mod, name, getattr(new_attach_mod, name)) + + # Detect our class object + class_matches = {} + for class_name in [obj for obj in dir(new_attach_mod) + if module_filter_re.match(obj)]: + + # Store our entry + class_matches[class_name] = \ + getattr(new_attach_mod, class_name) + + for class_name, class_plugin in class_matches.items(): + if hasattr(apprise_mod, class_name): + setattr(apprise_mod, class_name, class_plugin) diff --git a/test/test_api.py b/test/test_api.py index 793dee23..e25abfd9 100644 --- a/test/test_api.py +++ b/test/test_api.py @@ -48,10 +48,10 @@ from apprise import NotifyImageSize from apprise import __version__ from apprise import URLBase from apprise import PrivacyMode -from apprise.AppriseLocale import LazyTranslation -from apprise.AppriseLocale import gettext_lazy as _ +from apprise.locale import LazyTranslation +from apprise.locale import gettext_lazy as _ -from apprise.NotificationManager import NotificationManager +from apprise.manager_plugins import NotificationManager from apprise.utils import parse_list from helpers import OuterEventLoop import inspect diff --git a/test/test_apprise_attachments.py b/test/test_apprise_attachments.py index b96fb3b1..585a037d 100644 --- a/test/test_apprise_attachments.py +++ b/test/test_apprise_attachments.py @@ -34,11 +34,10 @@ from os.path import getsize from os.path import join from os.path import dirname from inspect import cleandoc -from apprise.Apprise import Apprise -from apprise.AttachmentManager import AttachmentManager -from apprise.AppriseAttachment import AppriseAttachment -from apprise.AppriseAsset import AppriseAsset -from apprise.attachment.AttachBase import AttachBase +from apprise import Apprise, AppriseAsset +from apprise.manager_attachment import AttachmentManager +from apprise.apprise_attachment import AppriseAttachment +from apprise.attachment import AttachBase from apprise.common import ContentLocation # Disable logging for a cleaner testing output diff --git a/test/test_apprise_cli.py b/test/test_apprise_cli.py index bcc44b6d..de2ed6c4 100644 --- a/test/test_apprise_cli.py +++ b/test/test_apprise_cli.py @@ -36,11 +36,10 @@ from os.path import dirname from os.path import join from apprise import cli from apprise import NotifyBase -from apprise.NotificationManager import NotificationManager +from apprise.manager_plugins import NotificationManager from click.testing import CliRunner from apprise.utils import environ - -from apprise.AppriseLocale import gettext_lazy as _ +from apprise.locale import gettext_lazy as _ from importlib import reload diff --git a/test/test_apprise_config.py b/test/test_apprise_config.py index fc5732d7..a0e0b816 100644 --- a/test/test_apprise_config.py +++ b/test/test_apprise_config.py @@ -35,12 +35,12 @@ from apprise import ContentIncludeMode from apprise import Apprise from apprise import AppriseConfig from apprise import AppriseAsset -from apprise.config.ConfigBase import ConfigBase -from apprise.plugins.NotifyBase import NotifyBase -from apprise.NotificationManager import NotificationManager -from apprise.ConfigurationManager import ConfigurationManager +from apprise.config import ConfigBase +from apprise.plugins import NotifyBase +from apprise.manager_plugins import NotificationManager +from apprise.manager_config import ConfigurationManager -from apprise.config.ConfigFile import ConfigFile +from apprise.config.file import ConfigFile # Disable logging for a cleaner testing output import logging diff --git a/test/test_apprise_pickle.py b/test/test_apprise_pickle.py index 9a14ec6f..8cbc69c0 100644 --- a/test/test_apprise_pickle.py +++ b/test/test_apprise_pickle.py @@ -61,7 +61,7 @@ def test_apprise_pickle_asset(tmpdir): def test_apprise_pickle_locale(tmpdir): """pickle: AppriseLocale """ - _locale = AppriseLocale.AppriseLocale() + _locale = AppriseLocale() serialized = pickle.dumps(_locale) new_locale = pickle.loads(serialized) diff --git a/test/test_apprise_translations.py b/test/test_apprise_translations.py index a5cf2ce4..8988fb1b 100644 --- a/test/test_apprise_translations.py +++ b/test/test_apprise_translations.py @@ -33,7 +33,7 @@ from unittest import mock import ctypes import pytest -from apprise import AppriseLocale +from apprise import locale from apprise.utils import environ from importlib import reload @@ -46,7 +46,7 @@ def test_apprise_trans(): """ API: Test apprise locale object """ - lazytrans = AppriseLocale.LazyTranslation('Token') + lazytrans = locale.LazyTranslation('Token') assert str(lazytrans) == 'Token' @@ -57,17 +57,17 @@ def test_apprise_trans_gettext_init(): API: Handle gettext """ # Toggle - AppriseLocale.GETTEXT_LOADED = False + locale.GETTEXT_LOADED = False # Objects can still be created - al = AppriseLocale.AppriseLocale() + al = locale.AppriseLocale() with al.lang_at('en') as _: # functions still behave as normal assert _ is None # Restore the object - AppriseLocale.GETTEXT_LOADED = True + locale.GETTEXT_LOADED = True @pytest.mark.skipif( @@ -87,14 +87,14 @@ def test_apprise_trans_gettext_translations( mock_gettext_trans.side_effect = FileNotFoundError() # This throws internally but we handle it gracefully - al = AppriseLocale.AppriseLocale() + al = locale.AppriseLocale() with al.lang_at('en'): # functions still behave as normal pass # This throws internally but we handle it gracefully - AppriseLocale.AppriseLocale(language="fr") + locale.AppriseLocale(language="fr") @pytest.mark.skipif( @@ -112,7 +112,7 @@ def test_apprise_trans_gettext_lang_at(mock_getlocale): mock_getlocale.return_value = ('en_CA', 'UTF-8') # This throws internally but we handle it gracefully - al = AppriseLocale.AppriseLocale() + al = locale.AppriseLocale() # Edge Cases assert al.add('en', set_default=False) is True @@ -123,7 +123,7 @@ def test_apprise_trans_gettext_lang_at(mock_getlocale): pass # This throws internally but we handle it gracefully - AppriseLocale.AppriseLocale(language="fr") + locale.AppriseLocale(language="fr") with al.lang_at('en') as _: # functions still behave as normal @@ -141,17 +141,17 @@ def test_apprise_trans_gettext_lang_at(mock_getlocale): # not have. This is only done to test edge cases when for whatever # reason the person who set up apprise does not have the languages # installed. - fallback = AppriseLocale.AppriseLocale._default_language + fallback = locale.AppriseLocale._default_language mock_getlocale.return_value = None with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'): # Our default language - AppriseLocale.AppriseLocale._default_language = 'zz' + locale.AppriseLocale._default_language = 'zz' # We will detect the zz since there were no environment variables to # help us otherwise - assert AppriseLocale.AppriseLocale.detect_language() is None - al = AppriseLocale.AppriseLocale() + assert locale.AppriseLocale.detect_language() is None + al = locale.AppriseLocale() # No Language could be set becuause no locale directory exists for this assert al.lang is None @@ -177,12 +177,12 @@ def test_apprise_trans_gettext_lang_at(mock_getlocale): with environ('LANGUAGE', 'LC_CTYPE', LC_ALL='C.UTF-8', LANG="en_CA"): # the UTF-8 entry is skipped over - AppriseLocale.AppriseLocale._default_language = 'fr' + locale.AppriseLocale._default_language = 'fr' # We will detect the english language (found in the LANG= environment # variable which over-rides the _default - assert AppriseLocale.AppriseLocale.detect_language() == "en" - al = AppriseLocale.AppriseLocale() + assert locale.AppriseLocale.detect_language() == "en" + al = locale.AppriseLocale() assert al.lang == "en" assert al.gettext('test') == 'test' @@ -194,7 +194,7 @@ def test_apprise_trans_gettext_lang_at(mock_getlocale): assert al.gettext('test') == 'test' assert al.add('zy', set_default=False) is False - AppriseLocale.AppriseLocale._default_language = fallback + locale.AppriseLocale._default_language = fallback @pytest.mark.skipif( @@ -206,17 +206,17 @@ def test_apprise_trans_add(): """ # This throws internally but we handle it gracefully - al = AppriseLocale.AppriseLocale() + al = locale.AppriseLocale() with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'): # English is the default/fallback type assert al.add('en') is True - al = AppriseLocale.AppriseLocale() + al = locale.AppriseLocale() with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', LANG='C.UTF-8'): # Test English Environment assert al.add('en') is True - al = AppriseLocale.AppriseLocale() + al = locale.AppriseLocale() with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', LANG='en_CA.UTF-8'): # Test English Environment assert al.add('en') is True @@ -251,29 +251,29 @@ def test_apprise_trans_windows_users_win(mock_getlocale): with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'): # Our default language - AppriseLocale.AppriseLocale._default_language = 'zz' + locale.AppriseLocale._default_language = 'zz' # We will pick up the windll module and detect english - assert AppriseLocale.AppriseLocale.detect_language() == 'en' + assert locale.AppriseLocale.detect_language() == 'en' # The below accesses the windows fallback code with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', LANG="es_AR"): # Environment Variable Trumps - assert AppriseLocale.AppriseLocale.detect_language() == 'es' + assert locale.AppriseLocale.detect_language() == 'es' # No environment variable, then the Windows environment is used with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'): # Windows Environment - assert AppriseLocale.AppriseLocale.detect_language() == 'en' + assert locale.AppriseLocale.detect_language() == 'en' - assert AppriseLocale.AppriseLocale\ + assert locale.AppriseLocale\ .detect_language(detect_fallback=False) is None # 0 = IndexError ui_lang.return_value = 0 with environ('LANGUAGE', 'LANG', 'LC_ALL', 'LC_CTYPE'): # We fall back to posix locale - assert AppriseLocale.AppriseLocale.detect_language() == 'fr' + assert locale.AppriseLocale.detect_language() == 'fr' @pytest.mark.skipif( @@ -299,29 +299,29 @@ def test_apprise_trans_windows_users_nux(mock_getlocale): with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'): # Our default language - AppriseLocale.AppriseLocale._default_language = 'zz' + locale.AppriseLocale._default_language = 'zz' # We will pick up the windll module and detect english - assert AppriseLocale.AppriseLocale.detect_language() == 'en' + assert locale.AppriseLocale.detect_language() == 'en' # The below accesses the windows fallback code with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', LANG="es_AR"): # Environment Variable Trumps - assert AppriseLocale.AppriseLocale.detect_language() == 'es' + assert locale.AppriseLocale.detect_language() == 'es' # No environment variable, then the Windows environment is used with environ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'): # Windows Environment - assert AppriseLocale.AppriseLocale.detect_language() == 'en' + assert locale.AppriseLocale.detect_language() == 'en' - assert AppriseLocale.AppriseLocale\ + assert locale.AppriseLocale\ .detect_language(detect_fallback=False) is None # 0 = IndexError windll.kernel32.GetUserDefaultUILanguage.return_value = 0 with environ('LANGUAGE', 'LANG', 'LC_ALL', 'LC_CTYPE'): # We fall back to posix locale - assert AppriseLocale.AppriseLocale.detect_language() == 'fr' + assert locale.AppriseLocale.detect_language() == 'fr' delattr(ctypes, 'windll') @@ -341,11 +341,11 @@ def test_detect_language_using_env(mock_getlocale): with environ('LANG', 'LANGUAGE', 'LC_ALL', 'LC_CTYPE'): # Language can now be detected in this case assert isinstance( - AppriseLocale.AppriseLocale.detect_language(), str) + locale.AppriseLocale.detect_language(), str) # Detect French language. with environ('LANGUAGE', 'LC_ALL', LC_CTYPE="garbage", LANG="fr_CA"): - assert AppriseLocale.AppriseLocale.detect_language() == 'fr' + assert locale.AppriseLocale.detect_language() == 'fr' # The following unsets all environment variables and sets LC_CTYPE # This was causing Python 2.7 to internally parse UTF-8 as an invalid @@ -353,24 +353,24 @@ def test_detect_language_using_env(mock_getlocale): # dropped, but just to ensure this issue does not come back, we keep # this test: with environ(*list(os.environ.keys()), LC_CTYPE="UTF-8"): - assert isinstance(AppriseLocale.AppriseLocale.detect_language(), str) + assert isinstance(locale.AppriseLocale.detect_language(), str) # Test with absolutely no environment variables what-so-ever with environ(*list(os.environ.keys())): - assert isinstance(AppriseLocale.AppriseLocale.detect_language(), str) + assert isinstance(locale.AppriseLocale.detect_language(), str) # Handle case where getlocale() can't be detected mock_getlocale.return_value = None with environ('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE'): - assert AppriseLocale.AppriseLocale.detect_language() is None + assert locale.AppriseLocale.detect_language() is None mock_getlocale.return_value = (None, None) with environ('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE'): - assert AppriseLocale.AppriseLocale.detect_language() is None + assert locale.AppriseLocale.detect_language() is None # if detect_language and windows env fail us, then we don't # set up a default language on first load - AppriseLocale.AppriseLocale() + locale.AppriseLocale() @pytest.mark.skipif( @@ -393,14 +393,14 @@ def test_apprise_trans_gettext_missing(tmpdir): sys.path.insert(0, str(gettext_dir)) # reload our module (forcing the import error when it tries to load gettext - reload(sys.modules['apprise.AppriseLocale']) - from apprise import AppriseLocale - assert AppriseLocale.GETTEXT_LOADED is False + reload(sys.modules['apprise.locale']) + from apprise import locale + assert locale.GETTEXT_LOADED is False # Now roll our changes back sys.path.pop(0) # Reload again (reverting back) - reload(sys.modules['apprise.AppriseLocale']) - from apprise import AppriseLocale - assert AppriseLocale.GETTEXT_LOADED is True + reload(sys.modules['apprise.locale']) + from apprise import locale + assert locale.GETTEXT_LOADED is True diff --git a/test/test_apprise_utils.py b/test/test_apprise_utils.py index d009b380..9ff79377 100644 --- a/test/test_apprise_utils.py +++ b/test/test_apprise_utils.py @@ -33,7 +33,7 @@ from inspect import cleandoc from urllib.parse import unquote from apprise import utils -from apprise.NotificationManager import NotificationManager +from apprise.manager_plugins import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_asyncio.py b/test/test_asyncio.py index 027f5b1f..7d8bf64f 100644 --- a/test/test_asyncio.py +++ b/test/test_asyncio.py @@ -31,7 +31,7 @@ import pytest from apprise import Apprise from apprise import NotifyBase from apprise import NotifyFormat -from apprise.NotificationManager import NotificationManager +from apprise.manager_plugins import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_attach_base.py b/test/test_attach_base.py index 4f47f6ad..8defd79b 100644 --- a/test/test_attach_base.py +++ b/test/test_attach_base.py @@ -28,7 +28,7 @@ import pytest from unittest import mock -from apprise.attachment.AttachBase import AttachBase +from apprise.attachment.base import AttachBase # Disable logging for a cleaner testing output import logging diff --git a/test/test_attach_file.py b/test/test_attach_file.py index 8a70fbc4..4f4fadee 100644 --- a/test/test_attach_file.py +++ b/test/test_attach_file.py @@ -33,8 +33,8 @@ from unittest import mock from os.path import dirname from os.path import join -from apprise.attachment.AttachBase import AttachBase -from apprise.attachment.AttachFile import AttachFile +from apprise.attachment.base import AttachBase +from apprise.attachment.file import AttachFile from apprise import AppriseAttachment from apprise.common import ContentLocation diff --git a/test/test_attach_http.py b/test/test_attach_http.py index e3b87bd1..5894341d 100644 --- a/test/test_attach_http.py +++ b/test/test_attach_http.py @@ -34,10 +34,10 @@ import mimetypes from os.path import join from os.path import dirname from os.path import getsize -from apprise.attachment.AttachHTTP import AttachHTTP +from apprise.attachment.http import AttachHTTP from apprise import Apprise, AppriseAttachment -from apprise.NotificationManager import NotificationManager -from apprise.plugins.NotifyBase import NotifyBase +from apprise.manager_plugins import NotificationManager +from apprise.plugins import NotifyBase from apprise.common import ContentLocation # Disable logging for a cleaner testing output diff --git a/test/test_config_base.py b/test/test_config_base.py index f15e7b90..1fb0082b 100644 --- a/test/test_config_base.py +++ b/test/test_config_base.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. import pytest -from apprise.AppriseAsset import AppriseAsset -from apprise.config.ConfigBase import ConfigBase +from apprise import AppriseAsset +from apprise.config import ConfigBase from apprise import Apprise from apprise import ConfigFormat from inspect import cleandoc @@ -37,7 +37,7 @@ import yaml # Disable logging for a cleaner testing output import logging -from apprise.plugins.NotifyEmail import NotifyEmail +from apprise.plugins.email import NotifyEmail logging.disable(logging.CRITICAL) diff --git a/test/test_config_file.py b/test/test_config_file.py index 1399e326..0a5bc034 100644 --- a/test/test_config_file.py +++ b/test/test_config_file.py @@ -28,9 +28,9 @@ from unittest import mock -from apprise.config.ConfigFile import ConfigFile -from apprise.plugins.NotifyBase import NotifyBase -from apprise.AppriseAsset import AppriseAsset +from apprise.config.file import ConfigFile +from apprise.plugins import NotifyBase +from apprise import AppriseAsset # Disable logging for a cleaner testing output import logging diff --git a/test/test_config_http.py b/test/test_config_http.py index 1b3a53b4..79c3c9b8 100644 --- a/test/test_config_http.py +++ b/test/test_config_http.py @@ -32,9 +32,9 @@ from unittest import mock import requests from apprise.common import ConfigFormat -from apprise.config.ConfigHTTP import ConfigHTTP -from apprise.plugins.NotifyBase import NotifyBase -from apprise.NotificationManager import NotificationManager +from apprise.config.http import ConfigHTTP +from apprise.plugins import NotifyBase +from apprise.manager_plugins import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_config_memory.py b/test/test_config_memory.py index f7babd8d..3c11d631 100644 --- a/test/test_config_memory.py +++ b/test/test_config_memory.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.config.ConfigMemory import ConfigMemory +from apprise.config.memory import ConfigMemory # Disable logging for a cleaner testing output import logging diff --git a/test/test_decorator_notify.py b/test/test_decorator_notify.py index a50a45df..d92986f5 100644 --- a/test/test_decorator_notify.py +++ b/test/test_decorator_notify.py @@ -29,13 +29,13 @@ from os.path import dirname from os.path import join from apprise.decorators import notify -from apprise.decorators.CustomNotifyPlugin import CustomNotifyPlugin +from apprise.decorators.base import CustomNotifyPlugin from apprise import Apprise from apprise import AppriseConfig from apprise import AppriseAsset from apprise import AppriseAttachment from apprise import common -from apprise.NotificationManager import NotificationManager +from apprise.manager_plugins import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_escapes.py b/test/test_escapes.py index 4d8bb3a4..d53c555f 100644 --- a/test/test_escapes.py +++ b/test/test_escapes.py @@ -26,8 +26,8 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from json import loads import requests +from json import loads from unittest import mock import apprise diff --git a/test/test_notification_manager.py b/test/test_notification_manager.py index d5b31144..4a09b54c 100644 --- a/test/test_notification_manager.py +++ b/test/test_notification_manager.py @@ -33,8 +33,8 @@ import threading from inspect import cleandoc from apprise import Apprise -from apprise.NotificationManager import NotificationManager -from apprise.plugins.NotifyBase import NotifyBase +from apprise.manager_plugins import NotificationManager +from apprise.plugins import NotifyBase # Disable logging for a cleaner testing output import logging @@ -346,7 +346,7 @@ def test_notification_manager_decorators(tmpdir): # # Bare Minimum Valid Object # - from apprise.plugins.NotifyBase import NotifyBase + from apprise.plugins import NotifyBase from apprise.common import NotifyType class NotifyTest(NotifyBase): @@ -356,7 +356,7 @@ def test_notification_manager_decorators(tmpdir): # The services URL service_url = 'https://github.com/caronc/apprise/' - # All boxcar notifications are secure + # Define our protocol secure_protocol = 'mytest' # A URL that takes you to the setup/help of the specific protocol @@ -382,42 +382,6 @@ def test_notification_manager_decorators(tmpdir): del N_MGR['mytest'] assert 'mytest' not in N_MGR - # Prepare ourselves a file to work with - notify_test = notify_base.join('NotifyNoAlign.py') - notify_test.write(cleandoc(""" - # - # Bare Minimum Valid Object - # - from apprise.plugins.NotifyBase import NotifyBase - from apprise.common import NotifyType - - class NotifyDifferentName(NotifyBase): - - service_name = 'Unloadable' - - # The services URL - service_url = 'https://github.com/caronc/apprise/' - - # All boxcar notifications are secure - secure_protocol = 'noload' - - # A URL that takes you to the setup/help of the specific protocol - setup_url = 'https://github.com/caronc/apprise/wiki/Notify_mytest' - - # Define object templates - templates = ( - '{schema}://', - ) - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs): - return True - - def url(self): - return 'mytest://' - """)) assert 'mytest' not in N_MGR N_MGR.load_modules(path=str(notify_base)) @@ -426,10 +390,6 @@ def test_notification_manager_decorators(tmpdir): N_MGR.load_modules(path=str(notify_base), force=True) assert 'mytest' in N_MGR - # Could not be loaded because the filename did not align with the class - # name. - assert 'noload' not in N_MGR - # Double load will test section of code that prevents a notification # From reloading if previously already loaded N_MGR.load_modules(path=str(notify_base)) diff --git a/test/test_notify_base.py b/test/test_notify_base.py index 26865626..c97f6a31 100644 --- a/test/test_notify_base.py +++ b/test/test_notify_base.py @@ -30,7 +30,7 @@ import pytest from datetime import datetime from datetime import timedelta -from apprise.plugins.NotifyBase import NotifyBase +from apprise.plugins import NotifyBase from apprise import NotifyType from apprise import NotifyImageSize from timeit import default_timer diff --git a/test/test_plugin_apprise_api.py b/test/test_plugin_apprise_api.py index 02e6378a..c33e5f63 100644 --- a/test/test_plugin_apprise_api.py +++ b/test/test_plugin_apprise_api.py @@ -28,7 +28,7 @@ import os from unittest import mock -from apprise.plugins.NotifyAppriseAPI import NotifyAppriseAPI +from apprise.plugins.apprise_api import NotifyAppriseAPI from helpers import AppriseURLTester import requests from apprise import Apprise diff --git a/test/test_plugin_aprs.py b/test/test_plugin_aprs.py index f61b154c..2399c956 100644 --- a/test/test_plugin_aprs.py +++ b/test/test_plugin_aprs.py @@ -29,7 +29,7 @@ from unittest import mock import socket import apprise -from apprise.plugins.NotifyAprs import NotifyAprs +from apprise.plugins.aprs import NotifyAprs # Disable logging for a cleaner testing output import logging diff --git a/test/test_plugin_bark.py b/test/test_plugin_bark.py index 57484d22..e8d12636 100644 --- a/test/test_plugin_bark.py +++ b/test/test_plugin_bark.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyBark import NotifyBark +from apprise.plugins.bark import NotifyBark from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_boxcar.py b/test/test_plugin_boxcar.py index 9f9340d1..c815b4b1 100644 --- a/test/test_plugin_boxcar.py +++ b/test/test_plugin_boxcar.py @@ -29,7 +29,7 @@ import pytest from unittest import mock -from apprise.plugins.NotifyBoxcar import NotifyBoxcar +from apprise.plugins.boxcar import NotifyBoxcar from helpers import AppriseURLTester from apprise import NotifyType import requests diff --git a/test/test_plugin_bulksms.py b/test/test_plugin_bulksms.py index 5aa9a890..f2def0a2 100644 --- a/test/test_plugin_bulksms.py +++ b/test/test_plugin_bulksms.py @@ -31,7 +31,7 @@ from unittest import mock import requests from json import loads from apprise import Apprise -from apprise.plugins.NotifyBulkSMS import NotifyBulkSMS +from apprise.plugins.bulksms import NotifyBulkSMS from helpers import AppriseURLTester from apprise import NotifyType diff --git a/test/test_plugin_bulkvs.py b/test/test_plugin_bulkvs.py index 889de429..a66663ab 100644 --- a/test/test_plugin_bulkvs.py +++ b/test/test_plugin_bulkvs.py @@ -31,7 +31,7 @@ from unittest import mock import requests from json import loads from apprise import Apprise -from apprise.plugins.NotifyBulkVS import NotifyBulkVS +from apprise.plugins.bulkvs import NotifyBulkVS from helpers import AppriseURLTester from apprise import NotifyType diff --git a/test/test_plugin_burstsms.py b/test/test_plugin_burstsms.py index dcffae2f..66560468 100644 --- a/test/test_plugin_burstsms.py +++ b/test/test_plugin_burstsms.py @@ -32,7 +32,7 @@ import pytest import requests from json import dumps -from apprise.plugins.NotifyBurstSMS import NotifyBurstSMS +from apprise.plugins.burstsms import NotifyBurstSMS from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_chantify.py b/test/test_plugin_chantify.py index 8c840157..e4d3b0df 100644 --- a/test/test_plugin_chantify.py +++ b/test/test_plugin_chantify.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyChantify import NotifyChantify +from apprise.plugins.chantify import NotifyChantify from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_clicksend.py b/test/test_plugin_clicksend.py index 6945b78c..3a0fab72 100644 --- a/test/test_plugin_clicksend.py +++ b/test/test_plugin_clicksend.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyClickSend import NotifyClickSend +from apprise.plugins.clicksend import NotifyClickSend from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_custom_form.py b/test/test_plugin_custom_form.py index 3d777a6b..8b7ef3b6 100644 --- a/test/test_plugin_custom_form.py +++ b/test/test_plugin_custom_form.py @@ -31,7 +31,7 @@ from unittest import mock import requests -from apprise.plugins.NotifyForm import NotifyForm +from apprise.plugins.custom_form import NotifyForm from helpers import AppriseURLTester from apprise import Apprise from apprise import NotifyType diff --git a/test/test_plugin_custom_json.py b/test/test_plugin_custom_json.py index b99a491c..d0f2be4a 100644 --- a/test/test_plugin_custom_json.py +++ b/test/test_plugin_custom_json.py @@ -35,7 +35,7 @@ from apprise import Apprise from apprise import AppriseAttachment from apprise import NotifyType -from apprise.plugins.NotifyJSON import NotifyJSON +from apprise.plugins.custom_json import NotifyJSON from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_custom_xml.py b/test/test_plugin_custom_xml.py index d585d0e3..24555ac5 100644 --- a/test/test_plugin_custom_xml.py +++ b/test/test_plugin_custom_xml.py @@ -34,7 +34,7 @@ import requests from apprise import Apprise from apprise import AppriseAttachment from apprise import NotifyType -from apprise.plugins.NotifyXML import NotifyXML +from apprise.plugins.custom_xml import NotifyXML from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_d7networks.py b/test/test_plugin_d7networks.py index 410c2609..f4f084a1 100644 --- a/test/test_plugin_d7networks.py +++ b/test/test_plugin_d7networks.py @@ -29,7 +29,7 @@ import requests from json import loads from unittest import mock -from apprise.plugins.NotifyD7Networks import NotifyD7Networks +from apprise.plugins.d7networks import NotifyD7Networks from helpers import AppriseURLTester from apprise import Apprise from apprise import NotifyType diff --git a/test/test_plugin_dapnet.py b/test/test_plugin_dapnet.py index cb1253a0..a62a0b4f 100644 --- a/test/test_plugin_dapnet.py +++ b/test/test_plugin_dapnet.py @@ -30,7 +30,7 @@ import requests from unittest import mock import apprise -from apprise.plugins.NotifyDapnet import DapnetPriority, NotifyDapnet +from apprise.plugins.dapnet import DapnetPriority, NotifyDapnet from helpers import AppriseURLTester from apprise import NotifyType diff --git a/test/test_plugin_dingtalk.py b/test/test_plugin_dingtalk.py index e4fbb81d..0ee72970 100644 --- a/test/test_plugin_dingtalk.py +++ b/test/test_plugin_dingtalk.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyDingTalk import NotifyDingTalk +from apprise.plugins.dingtalk import NotifyDingTalk from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_discord.py b/test/test_plugin_discord.py index ea634c3b..96cd8eb6 100644 --- a/test/test_plugin_discord.py +++ b/test/test_plugin_discord.py @@ -34,7 +34,7 @@ import pytest import requests from json import loads -from apprise.plugins.NotifyDiscord import NotifyDiscord +from apprise.plugins.discord import NotifyDiscord from helpers import AppriseURLTester from apprise import Apprise from apprise import AppriseAttachment diff --git a/test/test_plugin_email.py b/test/test_plugin_email.py index 69888ec9..1718c799 100644 --- a/test/test_plugin_email.py +++ b/test/test_plugin_email.py @@ -39,11 +39,11 @@ from email.header import decode_header from apprise import NotifyType, NotifyBase from apprise import Apprise from apprise import AttachBase -from apprise.AppriseAsset import AppriseAsset -from apprise.config.ConfigBase import ConfigBase +from apprise import AppriseAsset +from apprise.config import ConfigBase from apprise import AppriseAttachment -from apprise.plugins.NotifyEmail import NotifyEmail -from apprise.plugins import NotifyEmail as NotifyEmailModule +from apprise.plugins.email import NotifyEmail +from apprise.plugins import email as NotifyEmailModule # Disable logging for a cleaner testing output logging.disable(logging.CRITICAL) diff --git a/test/test_plugin_emby.py b/test/test_plugin_emby.py index 18c1a3b0..1636c4a5 100644 --- a/test/test_plugin_emby.py +++ b/test/test_plugin_emby.py @@ -32,7 +32,7 @@ from json import dumps from apprise import Apprise import requests -from apprise.plugins.NotifyEmby import NotifyEmby +from apprise.plugins.emby import NotifyEmby from helpers import AppriseURLTester # Disable logging for a cleaner testing output @@ -86,9 +86,9 @@ def test_plugin_template_urls(): AppriseURLTester(tests=apprise_url_tests).run_all() -@mock.patch('apprise.plugins.NotifyEmby.NotifyEmby.sessions') -@mock.patch('apprise.plugins.NotifyEmby.NotifyEmby.login') -@mock.patch('apprise.plugins.NotifyEmby.NotifyEmby.logout') +@mock.patch('apprise.plugins.emby.NotifyEmby.sessions') +@mock.patch('apprise.plugins.emby.NotifyEmby.login') +@mock.patch('apprise.plugins.emby.NotifyEmby.logout') @mock.patch('requests.get') @mock.patch('requests.post') def test_plugin_emby_general(mock_post, mock_get, mock_logout, @@ -276,8 +276,8 @@ def test_plugin_emby_login(mock_post, mock_get): assert obj.access_token == '0000-0000-0000-0000' -@mock.patch('apprise.plugins.NotifyEmby.NotifyEmby.login') -@mock.patch('apprise.plugins.NotifyEmby.NotifyEmby.logout') +@mock.patch('apprise.plugins.emby.NotifyEmby.login') +@mock.patch('apprise.plugins.emby.NotifyEmby.logout') @mock.patch('requests.get') @mock.patch('requests.post') def test_plugin_emby_sessions(mock_post, mock_get, mock_logout, mock_login): @@ -372,7 +372,7 @@ def test_plugin_emby_sessions(mock_post, mock_get, mock_logout, mock_login): assert len(sessions) == 0 -@mock.patch('apprise.plugins.NotifyEmby.NotifyEmby.login') +@mock.patch('apprise.plugins.emby.NotifyEmby.login') @mock.patch('requests.get') @mock.patch('requests.post') def test_plugin_emby_logout(mock_post, mock_get, mock_login): diff --git a/test/test_plugin_enigma2.py b/test/test_plugin_enigma2.py index ce2232a5..c70a5c0b 100644 --- a/test/test_plugin_enigma2.py +++ b/test/test_plugin_enigma2.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyEnigma2 import NotifyEnigma2 +from apprise.plugins.enigma2 import NotifyEnigma2 from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_fcm.py b/test/test_plugin_fcm.py index cb82f2bd..13a49852 100644 --- a/test/test_plugin_fcm.py +++ b/test/test_plugin_fcm.py @@ -40,15 +40,15 @@ import pytest import requests import json from apprise import Apprise -from apprise.plugins.NotifyFCM import NotifyFCM +from apprise.plugins.fcm import NotifyFCM from helpers import AppriseURLTester try: - from apprise.plugins.NotifyFCM.oauth import GoogleOAuth - from apprise.plugins.NotifyFCM.common import FCM_MODES - from apprise.plugins.NotifyFCM.priority import ( + from apprise.plugins.fcm.oauth import GoogleOAuth + from apprise.plugins.fcm.common import FCM_MODES + from apprise.plugins.fcm.priority import ( FCMPriorityManager, FCM_PRIORITIES) - from apprise.plugins.NotifyFCM.color import FCMColorManager + from apprise.plugins.fcm.color import FCMColorManager from cryptography.exceptions import UnsupportedAlgorithm except ImportError: diff --git a/test/test_plugin_feishu.py b/test/test_plugin_feishu.py index e7ed5296..76a874b2 100644 --- a/test/test_plugin_feishu.py +++ b/test/test_plugin_feishu.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyFeishu import NotifyFeishu +from apprise.plugins.feishu import NotifyFeishu from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_flock.py b/test/test_plugin_flock.py index 3071986c..fd4d86e8 100644 --- a/test/test_plugin_flock.py +++ b/test/test_plugin_flock.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests -from apprise.plugins.NotifyFlock import NotifyFlock +from apprise.plugins.flock import NotifyFlock from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_freemobile.py b/test/test_plugin_freemobile.py index aeb12364..402f43c1 100644 --- a/test/test_plugin_freemobile.py +++ b/test/test_plugin_freemobile.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyFreeMobile import NotifyFreeMobile +from apprise.plugins.freemobile import NotifyFreeMobile from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_glib.py b/test/test_plugin_glib.py index e9196a45..ecada38e 100644 --- a/test/test_plugin_glib.py +++ b/test/test_plugin_glib.py @@ -49,7 +49,7 @@ if 'dbus' not in sys.modules: from dbus import DBusException # noqa E402 -from apprise.plugins.NotifyDBus import DBusUrgency, NotifyDBus # noqa E402 +from apprise.plugins.dbus import DBusUrgency, NotifyDBus # noqa E402 def setup_glib_environment(): @@ -114,7 +114,7 @@ def setup_glib_environment(): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. - reload_plugin('NotifyDBus') + reload_plugin('dbus') @pytest.fixture @@ -415,7 +415,7 @@ def test_plugin_dbus_gi_missing(dbus_glib_environment): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. - reload_plugin('NotifyDBus') + reload_plugin('dbus') # Create the instance. obj = apprise.Apprise.instantiate('glib://', suppress_exceptions=False) @@ -442,7 +442,7 @@ def test_plugin_dbus_gi_require_version_error(dbus_glib_environment): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. - reload_plugin('NotifyDBus') + reload_plugin('dbus') # Create instance. obj = apprise.Apprise.instantiate('glib://', suppress_exceptions=False) @@ -469,7 +469,7 @@ def test_plugin_dbus_module_croaks(mocker, dbus_glib_environment): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. - reload_plugin('NotifyDBus') + reload_plugin('dbus') # Verify plugin is not available. obj = apprise.Apprise.instantiate('glib://', suppress_exceptions=False) diff --git a/test/test_plugin_gnome.py b/test/test_plugin_gnome.py index 66445204..eff460ea 100644 --- a/test/test_plugin_gnome.py +++ b/test/test_plugin_gnome.py @@ -36,7 +36,7 @@ from unittest.mock import Mock, call, ANY import pytest import apprise -from apprise.plugins.NotifyGnome import GnomeUrgency, NotifyGnome +from apprise.plugins.gnome import GnomeUrgency, NotifyGnome from helpers import reload_plugin # Disable logging for a cleaner testing output @@ -59,7 +59,7 @@ def setup_glib_environment(): # for the purpose of testing and capture the handling of the # library when it is missing del sys.modules[gi_name] - reload_plugin('NotifyGnome') + reload_plugin('gnome') # We need to fake our gnome environment for testing purposes since # the gi library isn't available on CI @@ -97,7 +97,7 @@ def setup_glib_environment(): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. - reload_plugin('NotifyGnome') + reload_plugin('gnome') @pytest.fixture @@ -344,7 +344,7 @@ def test_plugin_gnome_gi_croaks(): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. - reload_plugin('NotifyGnome') + reload_plugin('gnome') # Create instance. obj = apprise.Apprise.instantiate('gnome://', suppress_exceptions=False) diff --git a/test/test_plugin_google_chat.py b/test/test_plugin_google_chat.py index 4b041038..81edeb97 100644 --- a/test/test_plugin_google_chat.py +++ b/test/test_plugin_google_chat.py @@ -29,7 +29,7 @@ import requests import pytest from apprise import Apprise -from apprise.plugins.NotifyGoogleChat import NotifyGoogleChat +from apprise.plugins.google_chat import NotifyGoogleChat from helpers import AppriseURLTester from unittest import mock from apprise import NotifyType diff --git a/test/test_plugin_gotify.py b/test/test_plugin_gotify.py index de327de1..d6b6306d 100644 --- a/test/test_plugin_gotify.py +++ b/test/test_plugin_gotify.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests import apprise -from apprise.plugins.NotifyGotify import GotifyPriority, NotifyGotify +from apprise.plugins.gotify import GotifyPriority, NotifyGotify from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_growl.py b/test/test_plugin_growl.py index 19fe52e8..25886d0c 100644 --- a/test/test_plugin_growl.py +++ b/test/test_plugin_growl.py @@ -32,7 +32,7 @@ from unittest import mock import pytest import apprise from apprise import NotifyBase -from apprise.plugins.NotifyGrowl import GrowlPriority, NotifyGrowl +from apprise.plugins.growl import GrowlPriority, NotifyGrowl try: from gntp import errors diff --git a/test/test_plugin_guilded.py b/test/test_plugin_guilded.py index 7800786b..2e11f026 100644 --- a/test/test_plugin_guilded.py +++ b/test/test_plugin_guilded.py @@ -32,7 +32,7 @@ from unittest import mock import pytest import requests -from apprise.plugins.NotifyGuilded import NotifyGuilded +from apprise.plugins.guilded import NotifyGuilded from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_homeassistant.py b/test/test_plugin_homeassistant.py index 06636083..f2dfb58e 100644 --- a/test/test_plugin_homeassistant.py +++ b/test/test_plugin_homeassistant.py @@ -30,7 +30,7 @@ from unittest import mock import requests from apprise import Apprise -from apprise.plugins.NotifyHomeAssistant import NotifyHomeAssistant +from apprise.plugins.home_assistant import NotifyHomeAssistant from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_httpsms.py b/test/test_plugin_httpsms.py index 6ad7b368..20648cba 100644 --- a/test/test_plugin_httpsms.py +++ b/test/test_plugin_httpsms.py @@ -31,7 +31,7 @@ from unittest import mock import requests from json import loads from apprise import Apprise -from apprise.plugins.NotifyHttpSMS import NotifyHttpSMS +from apprise.plugins.httpsms import NotifyHttpSMS from helpers import AppriseURLTester from apprise import NotifyType diff --git a/test/test_plugin_ifttt.py b/test/test_plugin_ifttt.py index 22fbc189..2b40c1e9 100644 --- a/test/test_plugin_ifttt.py +++ b/test/test_plugin_ifttt.py @@ -31,7 +31,7 @@ from unittest import mock import requests from apprise import NotifyType -from apprise.plugins.NotifyIFTTT import NotifyIFTTT +from apprise.plugins.ifttt import NotifyIFTTT from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_join.py b/test/test_plugin_join.py index 2100ab92..e183f9ac 100644 --- a/test/test_plugin_join.py +++ b/test/test_plugin_join.py @@ -33,7 +33,7 @@ import requests import apprise from apprise import NotifyType from helpers import AppriseURLTester -from apprise.plugins.NotifyJoin import JoinPriority, NotifyJoin +from apprise.plugins.join import JoinPriority, NotifyJoin # Disable logging for a cleaner testing output import logging diff --git a/test/test_plugin_kavenegar.py b/test/test_plugin_kavenegar.py index 50751e11..5b266b01 100644 --- a/test/test_plugin_kavenegar.py +++ b/test/test_plugin_kavenegar.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyKavenegar import NotifyKavenegar +from apprise.plugins.kavenegar import NotifyKavenegar from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_kumulos.py b/test/test_plugin_kumulos.py index da8f09b0..9e9d8de9 100644 --- a/test/test_plugin_kumulos.py +++ b/test/test_plugin_kumulos.py @@ -29,7 +29,7 @@ import pytest import requests -from apprise.plugins.NotifyKumulos import NotifyKumulos +from apprise.plugins.kumulos import NotifyKumulos from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_lametric.py b/test/test_plugin_lametric.py index a9d19a3f..3fefed56 100644 --- a/test/test_plugin_lametric.py +++ b/test/test_plugin_lametric.py @@ -28,7 +28,7 @@ import pytest import requests -from apprise.plugins.NotifyLametric import NotifyLametric +from apprise.plugins.lametric import NotifyLametric from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_line.py b/test/test_plugin_line.py index e892edfd..f25c7e66 100644 --- a/test/test_plugin_line.py +++ b/test/test_plugin_line.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyLine import NotifyLine +from apprise.plugins.line import NotifyLine from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_lunasea.py b/test/test_plugin_lunasea.py index 3c521913..ab037b01 100644 --- a/test/test_plugin_lunasea.py +++ b/test/test_plugin_lunasea.py @@ -33,7 +33,7 @@ from json import loads import requests from helpers import AppriseURLTester -from apprise.plugins.NotifyLunaSea import NotifyLunaSea +from apprise.plugins.lunasea import NotifyLunaSea # Disable logging for a cleaner testing output import logging diff --git a/test/test_plugin_macosx.py b/test/test_plugin_macosx.py index d8c7538f..d2cd44b5 100644 --- a/test/test_plugin_macosx.py +++ b/test/test_plugin_macosx.py @@ -34,7 +34,7 @@ from unittest.mock import Mock import pytest import apprise -from apprise.plugins.NotifyMacOSX import NotifyMacOSX +from apprise.plugins.macosx import NotifyMacOSX from helpers import reload_plugin @@ -56,7 +56,7 @@ def pretend_macos(mocker): mocker.patch("platform.mac_ver", return_value=('10.8', ('', '', ''), '')) # Reload plugin module, in order to re-run module-level code. - reload_plugin("NotifyMacOSX") + reload_plugin("macosx") @pytest.fixture @@ -71,7 +71,7 @@ def terminal_notifier(mocker, tmp_path): os.chmod(notifier_program, 0o755) # Make the notifier use the temporary file instead of `terminal-notifier`. - mocker.patch("apprise.plugins.NotifyMacOSX.NotifyMacOSX.notify_paths", + mocker.patch("apprise.plugins.macosx.NotifyMacOSX.notify_paths", (str(notifier_program),)) yield notifier_program @@ -196,7 +196,7 @@ def test_plugin_macosx_pretend_linux(mocker, pretend_macos): # When patching something which has a side effect on the module-level code # of a plugin, make sure to reload it. mocker.patch("platform.system", return_value="Linux") - reload_plugin("NotifyMacOSX") + reload_plugin("macosx") # Our object is disabled. obj = apprise.Apprise.instantiate('macosx://', suppress_exceptions=False) @@ -213,7 +213,7 @@ def test_plugin_macosx_pretend_old_macos(mocker, macos_version): # of a plugin, make sure to reload it. mocker.patch("platform.mac_ver", return_value=(macos_version, ('', '', ''), '')) - reload_plugin("NotifyMacOSX") + reload_plugin("macosx") obj = apprise.Apprise.instantiate('macosx://', suppress_exceptions=False) assert obj is None diff --git a/test/test_plugin_mailgun.py b/test/test_plugin_mailgun.py index 1b5e0362..f030e40c 100644 --- a/test/test_plugin_mailgun.py +++ b/test/test_plugin_mailgun.py @@ -31,7 +31,7 @@ from unittest import mock import requests -from apprise.plugins.NotifyMailgun import NotifyMailgun +from apprise.plugins.mailgun import NotifyMailgun from helpers import AppriseURLTester from apprise import Apprise from apprise import AppriseAttachment diff --git a/test/test_plugin_mastodon.py b/test/test_plugin_mastodon.py index 4a025f44..e6ba2fc2 100644 --- a/test/test_plugin_mastodon.py +++ b/test/test_plugin_mastodon.py @@ -36,7 +36,7 @@ from datetime import timezone from apprise import Apprise from apprise import NotifyType from apprise import AppriseAttachment -from apprise.plugins.NotifyMastodon import NotifyMastodon +from apprise.plugins.mastodon import NotifyMastodon from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_matrix.py b/test/test_plugin_matrix.py index ba36ce9f..df7e4dca 100644 --- a/test/test_plugin_matrix.py +++ b/test/test_plugin_matrix.py @@ -33,7 +33,7 @@ import pytest from apprise import Apprise, AppriseAsset, AppriseAttachment, NotifyType from json import dumps -from apprise.plugins.NotifyMatrix import NotifyMatrix +from apprise.plugins.matrix import NotifyMatrix from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_mattermost.py b/test/test_plugin_mattermost.py index 4e0290c5..8fb9c249 100644 --- a/test/test_plugin_mattermost.py +++ b/test/test_plugin_mattermost.py @@ -29,7 +29,7 @@ import pytest import requests -from apprise.plugins.NotifyMattermost import NotifyMattermost +from apprise.plugins.mattermost import NotifyMattermost from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_messagebird.py b/test/test_plugin_messagebird.py index 3d98fb59..4e5cbd9b 100644 --- a/test/test_plugin_messagebird.py +++ b/test/test_plugin_messagebird.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests -from apprise.plugins.NotifyMessageBird import NotifyMessageBird +from apprise.plugins.messagebird import NotifyMessageBird from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_misskey.py b/test/test_plugin_misskey.py index 226579b5..1f8d9cce 100644 --- a/test/test_plugin_misskey.py +++ b/test/test_plugin_misskey.py @@ -28,7 +28,7 @@ import os -from apprise.plugins.NotifyMisskey import NotifyMisskey +from apprise.plugins.misskey import NotifyMisskey from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_mqtt.py b/test/test_plugin_mqtt.py index c0112327..3f748606 100644 --- a/test/test_plugin_mqtt.py +++ b/test/test_plugin_mqtt.py @@ -35,7 +35,7 @@ from unittest.mock import call, Mock, ANY import pytest import apprise -from apprise.plugins.NotifyMQTT import NotifyMQTT +from apprise.plugins.mqtt import NotifyMQTT # Disable logging for a cleaner testing output logging.disable(logging.CRITICAL) diff --git a/test/test_plugin_msg91.py b/test/test_plugin_msg91.py index d99f7641..07439740 100644 --- a/test/test_plugin_msg91.py +++ b/test/test_plugin_msg91.py @@ -32,7 +32,7 @@ import pytest import requests from json import loads from apprise import Apprise -from apprise.plugins.NotifyMSG91 import NotifyMSG91 +from apprise.plugins.msg91 import NotifyMSG91 from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_msteams.py b/test/test_plugin_msteams.py index 59801f4d..377c7467 100644 --- a/test/test_plugin_msteams.py +++ b/test/test_plugin_msteams.py @@ -34,7 +34,7 @@ import pytest from apprise import Apprise from apprise import AppriseConfig from apprise import NotifyType -from apprise.plugins.NotifyMSTeams import NotifyMSTeams +from apprise.plugins.msteams import NotifyMSTeams from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_nextcloud.py b/test/test_plugin_nextcloud.py index 50528a48..f534903a 100644 --- a/test/test_plugin_nextcloud.py +++ b/test/test_plugin_nextcloud.py @@ -30,7 +30,7 @@ from unittest import mock from apprise import Apprise from apprise import NotifyType import requests -from apprise.plugins.NotifyNextcloud import NotifyNextcloud +from apprise.plugins.nextcloud import NotifyNextcloud from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_nextcloudtalk.py b/test/test_plugin_nextcloudtalk.py index 10531a48..33052c20 100644 --- a/test/test_plugin_nextcloudtalk.py +++ b/test/test_plugin_nextcloudtalk.py @@ -30,7 +30,7 @@ from unittest import mock from apprise import Apprise from apprise import NotifyType import requests -from apprise.plugins.NotifyNextcloudTalk import NotifyNextcloudTalk +from apprise.plugins.nextcloudtalk import NotifyNextcloudTalk from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_notica.py b/test/test_plugin_notica.py index 5aeaad91..459c4f0e 100644 --- a/test/test_plugin_notica.py +++ b/test/test_plugin_notica.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyNotica import NotifyNotica +from apprise.plugins.notica import NotifyNotica from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_notifiarr.py b/test/test_plugin_notifiarr.py index 7c30f8e2..bac556db 100644 --- a/test/test_plugin_notifiarr.py +++ b/test/test_plugin_notifiarr.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyNotifiarr import NotifyNotifiarr +from apprise.plugins.notifiarr import NotifyNotifiarr from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_notifico.py b/test/test_plugin_notifico.py index 710fcb6e..13e52e2e 100644 --- a/test/test_plugin_notifico.py +++ b/test/test_plugin_notifico.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyNotifico import NotifyNotifico +from apprise.plugins.notifico import NotifyNotifico from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_ntfy.py b/test/test_plugin_ntfy.py index 8a7e60d1..e976a29c 100644 --- a/test/test_plugin_ntfy.py +++ b/test/test_plugin_ntfy.py @@ -34,7 +34,7 @@ import requests import apprise from helpers import AppriseURLTester -from apprise.plugins.NotifyNtfy import NtfyPriority, NotifyNtfy +from apprise.plugins.ntfy import NtfyPriority, NotifyNtfy # Disable logging for a cleaner testing output import logging diff --git a/test/test_plugin_office365.py b/test/test_plugin_office365.py index 63cabacd..9a6a001e 100644 --- a/test/test_plugin_office365.py +++ b/test/test_plugin_office365.py @@ -34,7 +34,7 @@ import requests from datetime import datetime from json import dumps from apprise import Apprise -from apprise.plugins.NotifyOffice365 import NotifyOffice365 +from apprise.plugins.office365 import NotifyOffice365 from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_onesignal.py b/test/test_plugin_onesignal.py index ad48ec6e..e6b32e5b 100644 --- a/test/test_plugin_onesignal.py +++ b/test/test_plugin_onesignal.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyOneSignal import NotifyOneSignal +from apprise.plugins.one_signal import NotifyOneSignal from helpers import AppriseURLTester from apprise import Apprise diff --git a/test/test_plugin_opsgenie.py b/test/test_plugin_opsgenie.py index df939980..7d8c6c58 100644 --- a/test/test_plugin_opsgenie.py +++ b/test/test_plugin_opsgenie.py @@ -30,7 +30,7 @@ from unittest import mock import requests import apprise -from apprise.plugins.NotifyOpsgenie import NotifyOpsgenie, OpsgeniePriority +from apprise.plugins.opsgenie import NotifyOpsgenie, OpsgeniePriority from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pagerduty.py b/test/test_plugin_pagerduty.py index 7e76e039..0addbf5d 100644 --- a/test/test_plugin_pagerduty.py +++ b/test/test_plugin_pagerduty.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyPagerDuty import NotifyPagerDuty +from apprise.plugins.pagerduty import NotifyPagerDuty from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pagertree.py b/test/test_plugin_pagertree.py index d1ef2f3d..3bb2e728 100644 --- a/test/test_plugin_pagertree.py +++ b/test/test_plugin_pagertree.py @@ -30,7 +30,7 @@ import requests from unittest import mock import pytest -from apprise.plugins.NotifyPagerTree import NotifyPagerTree +from apprise.plugins.pagertree import NotifyPagerTree from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_parse_platform.py b/test/test_plugin_parse_platform.py index 8ec82699..c709ee2f 100644 --- a/test/test_plugin_parse_platform.py +++ b/test/test_plugin_parse_platform.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyParsePlatform import NotifyParsePlatform +from apprise.plugins.parseplatform import NotifyParsePlatform from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_popcorn_notify.py b/test/test_plugin_popcorn_notify.py index 6ff38c2b..b6dc1a30 100644 --- a/test/test_plugin_popcorn_notify.py +++ b/test/test_plugin_popcorn_notify.py @@ -27,7 +27,7 @@ # POSSIBILITY OF SUCH DAMAGE. import requests -from apprise.plugins.NotifyPopcornNotify import NotifyPopcornNotify +from apprise.plugins.popcorn_notify import NotifyPopcornNotify from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_prowl.py b/test/test_plugin_prowl.py index 7dab9996..4ceaf5be 100644 --- a/test/test_plugin_prowl.py +++ b/test/test_plugin_prowl.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests import apprise -from apprise.plugins.NotifyProwl import NotifyProwl, ProwlPriority +from apprise.plugins.prowl import NotifyProwl, ProwlPriority from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushbullet.py b/test/test_plugin_pushbullet.py index 2814baca..db3f4af5 100644 --- a/test/test_plugin_pushbullet.py +++ b/test/test_plugin_pushbullet.py @@ -34,7 +34,7 @@ import requests from json import dumps from apprise import Apprise from apprise import AppriseAttachment -from apprise.plugins.NotifyPushBullet import NotifyPushBullet +from apprise.plugins.pushbullet import NotifyPushBullet from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushdeer.py b/test/test_plugin_pushdeer.py index 4890d39b..618bc6ab 100644 --- a/test/test_plugin_pushdeer.py +++ b/test/test_plugin_pushdeer.py @@ -30,7 +30,7 @@ from unittest import mock import requests from apprise import Apprise -from apprise.plugins.NotifyPushDeer import NotifyPushDeer +from apprise.plugins.pushdeer import NotifyPushDeer from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushed.py b/test/test_plugin_pushed.py index c79f797c..e535c0f4 100644 --- a/test/test_plugin_pushed.py +++ b/test/test_plugin_pushed.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests -from apprise.plugins.NotifyPushed import NotifyPushed +from apprise.plugins.pushed import NotifyPushed from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushjet.py b/test/test_plugin_pushjet.py index ceee0871..a6b41689 100644 --- a/test/test_plugin_pushjet.py +++ b/test/test_plugin_pushjet.py @@ -29,7 +29,7 @@ import pytest import requests -from apprise.plugins.NotifyPushjet import NotifyPushjet +from apprise.plugins.pushjet import NotifyPushjet from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushme.py b/test/test_plugin_pushme.py index 2841ff37..2c8daf3a 100644 --- a/test/test_plugin_pushme.py +++ b/test/test_plugin_pushme.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyPushMe import NotifyPushMe +from apprise.plugins.pushme import NotifyPushMe from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushover.py b/test/test_plugin_pushover.py index cafee80b..1fd92667 100644 --- a/test/test_plugin_pushover.py +++ b/test/test_plugin_pushover.py @@ -32,7 +32,7 @@ from unittest import mock import requests import pytest from json import dumps -from apprise.plugins.NotifyPushover import PushoverPriority, NotifyPushover +from apprise.plugins.pushover import PushoverPriority, NotifyPushover import apprise from helpers import AppriseURLTester diff --git a/test/test_plugin_pushsafer.py b/test/test_plugin_pushsafer.py index b5ba8403..78211e44 100644 --- a/test/test_plugin_pushsafer.py +++ b/test/test_plugin_pushsafer.py @@ -34,7 +34,7 @@ import requests from json import dumps from apprise import AppriseAttachment from apprise import NotifyType -from apprise.plugins.NotifyPushSafer import NotifyPushSafer +from apprise.plugins.pushsafer import NotifyPushSafer from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_pushy.py b/test/test_plugin_pushy.py index 542a4a0f..63ed5141 100644 --- a/test/test_plugin_pushy.py +++ b/test/test_plugin_pushy.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyPushy import NotifyPushy +from apprise.plugins.pushy import NotifyPushy from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_reddit.py b/test/test_plugin_reddit.py index e174b38d..9d408b6b 100644 --- a/test/test_plugin_reddit.py +++ b/test/test_plugin_reddit.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyReddit import NotifyReddit +from apprise.plugins.reddit import NotifyReddit from helpers import AppriseURLTester from unittest import mock diff --git a/test/test_plugin_revolt.py b/test/test_plugin_revolt.py index 2db89407..cbbda422 100644 --- a/test/test_plugin_revolt.py +++ b/test/test_plugin_revolt.py @@ -33,7 +33,7 @@ from json import dumps import pytest import requests -from apprise.plugins.NotifyRevolt import NotifyRevolt +from apprise.plugins.revolt import NotifyRevolt from helpers import AppriseURLTester from apprise import Apprise from apprise import NotifyType diff --git a/test/test_plugin_rocket_chat.py b/test/test_plugin_rocket_chat.py index 858d79d1..d5abad24 100644 --- a/test/test_plugin_rocket_chat.py +++ b/test/test_plugin_rocket_chat.py @@ -29,7 +29,7 @@ import pytest import requests from apprise import NotifyType -from apprise.plugins.NotifyRocketChat import NotifyRocketChat +from apprise.plugins.rocketchat import NotifyRocketChat from helpers import AppriseURLTester from unittest import mock diff --git a/test/test_plugin_rsyslog.py b/test/test_plugin_rsyslog.py index c125e510..42ad3ca2 100644 --- a/test/test_plugin_rsyslog.py +++ b/test/test_plugin_rsyslog.py @@ -37,7 +37,7 @@ import socket import logging logging.disable(logging.CRITICAL) -from apprise.plugins.NotifyRSyslog import NotifyRSyslog # noqa E402 +from apprise.plugins.rsyslog import NotifyRSyslog # noqa E402 @mock.patch('socket.socket') diff --git a/test/test_plugin_ryver.py b/test/test_plugin_ryver.py index 0944575c..09314c86 100644 --- a/test/test_plugin_ryver.py +++ b/test/test_plugin_ryver.py @@ -29,7 +29,7 @@ import pytest import requests -from apprise.plugins.NotifyRyver import NotifyRyver +from apprise.plugins.ryver import NotifyRyver from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_sendgrid.py b/test/test_plugin_sendgrid.py index 74d2c7a0..328e8a00 100644 --- a/test/test_plugin_sendgrid.py +++ b/test/test_plugin_sendgrid.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests -from apprise.plugins.NotifySendGrid import NotifySendGrid +from apprise.plugins.sendgrid import NotifySendGrid from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_serverchan.py b/test/test_plugin_serverchan.py index 0b89b75f..cc2401c2 100644 --- a/test/test_plugin_serverchan.py +++ b/test/test_plugin_serverchan.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyServerChan import NotifyServerChan +from apprise.plugins.serverchan import NotifyServerChan from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_ses.py b/test/test_plugin_ses.py index 86f326e6..ee1870f7 100644 --- a/test/test_plugin_ses.py +++ b/test/test_plugin_ses.py @@ -34,7 +34,7 @@ import pytest import requests from apprise import Apprise from apprise import AppriseAttachment -from apprise.plugins.NotifySES import NotifySES +from apprise.plugins.ses import NotifySES from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_signal.py b/test/test_plugin_signal.py index fc50dcd6..0555bfe1 100644 --- a/test/test_plugin_signal.py +++ b/test/test_plugin_signal.py @@ -34,11 +34,11 @@ from inspect import cleandoc import pytest import requests from apprise import Apprise -from apprise.plugins.NotifySignalAPI import NotifySignalAPI +from apprise.plugins.signal_api import NotifySignalAPI from helpers import AppriseURLTester from apprise import AppriseAttachment from apprise import NotifyType -from apprise.config.ConfigBase import ConfigBase +from apprise.config import ConfigBase # Disable logging for a cleaner testing output import logging diff --git a/test/test_plugin_simplepush.py b/test/test_plugin_simplepush.py index f8ce9cb5..48fabe17 100644 --- a/test/test_plugin_simplepush.py +++ b/test/test_plugin_simplepush.py @@ -33,7 +33,7 @@ import pytest import requests import json from apprise import Apprise -from apprise.plugins.NotifySimplePush import NotifySimplePush +from apprise.plugins.simplepush import NotifySimplePush from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_sinch.py b/test/test_plugin_sinch.py index e25abc3b..6f7af650 100644 --- a/test/test_plugin_sinch.py +++ b/test/test_plugin_sinch.py @@ -32,7 +32,7 @@ import pytest import requests from json import dumps -from apprise.plugins.NotifySinch import NotifySinch +from apprise.plugins.sinch import NotifySinch from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_slack.py b/test/test_plugin_slack.py index 24bf112f..0ebf68b9 100644 --- a/test/test_plugin_slack.py +++ b/test/test_plugin_slack.py @@ -35,7 +35,7 @@ import requests from apprise import Apprise from apprise import NotifyType from apprise import AppriseAttachment -from apprise.plugins.NotifySlack import NotifySlack +from apprise.plugins.slack import NotifySlack from helpers import AppriseURLTester from json import loads, dumps diff --git a/test/test_plugin_sms_manager.py b/test/test_plugin_sms_manager.py index 9317695d..7b88e5e4 100644 --- a/test/test_plugin_sms_manager.py +++ b/test/test_plugin_sms_manager.py @@ -30,7 +30,7 @@ from unittest import mock import requests from apprise import Apprise -from apprise.plugins.NotifySMSManager import NotifySMSManager +from apprise.plugins.smsmanager import NotifySMSManager from helpers import AppriseURLTester from apprise import NotifyType diff --git a/test/test_plugin_smseagle.py b/test/test_plugin_smseagle.py index 49c9eee2..717ea7ed 100644 --- a/test/test_plugin_smseagle.py +++ b/test/test_plugin_smseagle.py @@ -32,7 +32,7 @@ from unittest import mock import requests from apprise import Apprise -from apprise.plugins.NotifySMSEagle import NotifySMSEagle +from apprise.plugins.smseagle import NotifySMSEagle from helpers import AppriseURLTester from apprise import AppriseAttachment from apprise import NotifyType diff --git a/test/test_plugin_smtp2go.py b/test/test_plugin_smtp2go.py index 2c63ef77..7f487d1d 100644 --- a/test/test_plugin_smtp2go.py +++ b/test/test_plugin_smtp2go.py @@ -33,7 +33,7 @@ import requests from apprise import Apprise from apprise import AppriseAttachment from apprise import NotifyType -from apprise.plugins.NotifySMTP2Go import NotifySMTP2Go +from apprise.plugins.smtp2go import NotifySMTP2Go from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_sns.py b/test/test_plugin_sns.py index caf0e2b8..56c49828 100644 --- a/test/test_plugin_sns.py +++ b/test/test_plugin_sns.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests from apprise import Apprise -from apprise.plugins.NotifySNS import NotifySNS +from apprise.plugins.sns import NotifySNS from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_sparkpost.py b/test/test_plugin_sparkpost.py index 14ab8eaa..6e29f739 100644 --- a/test/test_plugin_sparkpost.py +++ b/test/test_plugin_sparkpost.py @@ -35,7 +35,7 @@ from json import dumps from apprise import Apprise from apprise import AppriseAttachment from apprise import NotifyType -from apprise.plugins.NotifySparkPost import NotifySparkPost +from apprise.plugins.sparkpost import NotifySparkPost from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_streamlabs.py b/test/test_plugin_streamlabs.py index 161f58fa..51a848e3 100644 --- a/test/test_plugin_streamlabs.py +++ b/test/test_plugin_streamlabs.py @@ -26,7 +26,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -from apprise.plugins.NotifyStreamlabs import NotifyStreamlabs +from apprise.plugins.streamlabs import NotifyStreamlabs from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_synology.py b/test/test_plugin_synology.py index b6ea0505..a4997fb2 100644 --- a/test/test_plugin_synology.py +++ b/test/test_plugin_synology.py @@ -29,7 +29,7 @@ import requests from unittest import mock -from apprise.plugins.NotifySynology import NotifySynology +from apprise.plugins.synology import NotifySynology from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_syslog.py b/test/test_plugin_syslog.py index ea132767..a0eeef6e 100644 --- a/test/test_plugin_syslog.py +++ b/test/test_plugin_syslog.py @@ -41,7 +41,7 @@ logging.disable(logging.CRITICAL) if 'syslog' not in sys.modules: pytest.skip("Skipping syslog based tests", allow_module_level=True) -from apprise.plugins.NotifySyslog import NotifySyslog # noqa E402 +from apprise.plugins.syslog import NotifySyslog # noqa E402 @mock.patch('syslog.syslog') diff --git a/test/test_plugin_techululs_push.py b/test/test_plugin_techululs_push.py index 9819ac60..8667644e 100644 --- a/test/test_plugin_techululs_push.py +++ b/test/test_plugin_techululs_push.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyTechulusPush import NotifyTechulusPush +from apprise.plugins.techuluspush import NotifyTechulusPush from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_telegram.py b/test/test_plugin_telegram.py index b640d865..2bda79b7 100644 --- a/test/test_plugin_telegram.py +++ b/test/test_plugin_telegram.py @@ -38,7 +38,7 @@ from apprise import AppriseAttachment from apprise import AppriseAsset from apprise import NotifyType from apprise import NotifyFormat -from apprise.plugins.NotifyTelegram import NotifyTelegram +from apprise.plugins.telegram import NotifyTelegram from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_threema.py b/test/test_plugin_threema.py index 810cc2bd..f3ee80b2 100644 --- a/test/test_plugin_threema.py +++ b/test/test_plugin_threema.py @@ -31,7 +31,7 @@ from unittest import mock import pytest import requests -from apprise.plugins.NotifyThreema import NotifyThreema +from apprise.plugins.threema import NotifyThreema from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_title_maxlen.py b/test/test_plugin_title_maxlen.py index dd6e7333..29b080b2 100644 --- a/test/test_plugin_title_maxlen.py +++ b/test/test_plugin_title_maxlen.py @@ -33,7 +33,7 @@ from inspect import cleandoc import pytest import requests from apprise import Apprise -from apprise.config.ConfigBase import ConfigBase +from apprise.config import ConfigBase # Disable logging for a cleaner testing output import logging diff --git a/test/test_plugin_twilio.py b/test/test_plugin_twilio.py index 69cf2e66..0e4f653f 100644 --- a/test/test_plugin_twilio.py +++ b/test/test_plugin_twilio.py @@ -32,7 +32,7 @@ import requests import pytest from json import dumps from apprise import Apprise -from apprise.plugins.NotifyTwilio import NotifyTwilio +from apprise.plugins.twilio import NotifyTwilio from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_twist.py b/test/test_plugin_twist.py index 7650ddd1..9d60addf 100644 --- a/test/test_plugin_twist.py +++ b/test/test_plugin_twist.py @@ -32,7 +32,7 @@ import pytest import requests from json import dumps from apprise import Apprise -from apprise.plugins.NotifyTwist import NotifyTwist +from apprise.plugins.twist import NotifyTwist from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_twitter.py b/test/test_plugin_twitter.py index 3a44c07b..4b2f4be0 100644 --- a/test/test_plugin_twitter.py +++ b/test/test_plugin_twitter.py @@ -39,7 +39,7 @@ import requests from apprise import Apprise from apprise import NotifyType from apprise import AppriseAttachment -from apprise.plugins.NotifyTwitter import NotifyTwitter +from apprise.plugins.twitter import NotifyTwitter from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_voipms.py b/test/test_plugin_voipms.py index 28aa47cd..1e09f5dc 100644 --- a/test/test_plugin_voipms.py +++ b/test/test_plugin_voipms.py @@ -33,7 +33,7 @@ import requests from json import dumps from apprise import Apprise -from apprise.plugins.NotifyVoipms import NotifyVoipms +from apprise.plugins.voipms import NotifyVoipms from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_vonage.py b/test/test_plugin_vonage.py index d2a41ec6..94e413d4 100644 --- a/test/test_plugin_vonage.py +++ b/test/test_plugin_vonage.py @@ -32,7 +32,7 @@ import pytest import requests from json import dumps -from apprise.plugins.NotifyVonage import NotifyVonage +from apprise.plugins.vonage import NotifyVonage from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_webex_teams.py b/test/test_plugin_webex_teams.py index c136bc2e..11b003fd 100644 --- a/test/test_plugin_webex_teams.py +++ b/test/test_plugin_webex_teams.py @@ -27,7 +27,7 @@ # POSSIBILITY OF SUCH DAMAGE. import requests -from apprise.plugins.NotifyWebexTeams import NotifyWebexTeams +from apprise.plugins.webexteams import NotifyWebexTeams from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_wecombot.py b/test/test_plugin_wecombot.py index dc2a2c9e..0220b74a 100644 --- a/test/test_plugin_wecombot.py +++ b/test/test_plugin_wecombot.py @@ -28,7 +28,7 @@ import requests -from apprise.plugins.NotifyWeComBot import NotifyWeComBot +from apprise.plugins.wecombot import NotifyWeComBot from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_whatsapp.py b/test/test_plugin_whatsapp.py index 08f9f971..5986a34c 100644 --- a/test/test_plugin_whatsapp.py +++ b/test/test_plugin_whatsapp.py @@ -32,7 +32,7 @@ import requests import pytest from json import dumps, loads from apprise import Apprise -from apprise.plugins.NotifyWhatsApp import NotifyWhatsApp +from apprise.plugins.whatsapp import NotifyWhatsApp from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_xbmc_kodi.py b/test/test_plugin_xbmc_kodi.py index b275ec18..5d276a4a 100644 --- a/test/test_plugin_xbmc_kodi.py +++ b/test/test_plugin_xbmc_kodi.py @@ -28,7 +28,7 @@ import requests from apprise import NotifyType -from apprise.plugins.NotifyXBMC import NotifyXBMC +from apprise.plugins.xbmc import NotifyXBMC from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_plugin_zulip.py b/test/test_plugin_zulip.py index 68187720..013f4cc9 100644 --- a/test/test_plugin_zulip.py +++ b/test/test_plugin_zulip.py @@ -29,7 +29,7 @@ import pytest import requests -from apprise.plugins.NotifyZulip import NotifyZulip +from apprise.plugins.zulip import NotifyZulip from helpers import AppriseURLTester # Disable logging for a cleaner testing output diff --git a/test/test_rest_plugins.py b/test/test_rest_plugins.py index 78b70e37..5dc3914d 100644 --- a/test/test_rest_plugins.py +++ b/test/test_rest_plugins.py @@ -35,10 +35,10 @@ from string import ascii_uppercase as str_alpha from string import digits as str_num from apprise import NotifyBase -from apprise.common import NotifyFormat -from apprise.common import OverflowMode -from apprise.AppriseAsset import AppriseAsset -from apprise.Apprise import Apprise +from apprise import NotifyFormat +from apprise import OverflowMode +from apprise import AppriseAsset +from apprise import Apprise # Disable logging for a cleaner testing output import logging