From 286a4374c0988eb996c469557617b8b0c3d885d5 Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Sun, 19 May 2024 15:25:01 -0400 Subject: [PATCH] manager classes accessible from apprise base --- apprise/__init__.py | 7 ++++++- test/conftest.py | 6 +++--- test/helpers/module.py | 4 ++-- test/test_api.py | 2 +- test/test_apprise_attachments.py | 2 +- test/test_apprise_cli.py | 2 +- test/test_apprise_config.py | 4 ++-- test/test_apprise_utils.py | 2 +- test/test_asyncio.py | 2 +- test/test_attach_http.py | 2 +- test/test_config_http.py | 2 +- test/test_decorator_notify.py | 2 +- test/test_notification_manager.py | 2 +- 13 files changed, 22 insertions(+), 17 deletions(-) diff --git a/apprise/__init__.py b/apprise/__init__.py index 45752859..c57e7701 100644 --- a/apprise/__init__.py +++ b/apprise/__init__.py @@ -60,7 +60,9 @@ from .locale import AppriseLocale from .asset import AppriseAsset from .apprise_config import AppriseConfig from .apprise_attachment import AppriseAttachment - +from .manager_attachment import AttachmentManager +from .manager_config import ConfigurationManager +from .manager_plugins import NotificationManager from . import decorators # Inherit our logging with our additional entries added to it @@ -84,6 +86,9 @@ __all__ = [ 'ContentLocation', 'CONTENT_LOCATIONS', 'PrivacyMode', + # Managers + 'NotificationManager', 'ConfigurationManager', 'AttachmentManager', + # Decorator 'decorators', diff --git a/test/conftest.py b/test/conftest.py index 84b0008b..50236cc9 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -31,9 +31,9 @@ import os import pytest -from apprise.manager_plugins import NotificationManager -from apprise.manager_config import ConfigurationManager -from apprise.manager_attachment import AttachmentManager +from apprise import NotificationManager +from apprise import ConfigurationManager +from apprise 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 a870a78c..d991a96d 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.manager_plugins import NotificationManager -from apprise.manager_attachment import AttachmentManager +from apprise import NotificationManager +from apprise import AttachmentManager import sys import re diff --git a/test/test_api.py b/test/test_api.py index 025e5319..a7227244 100644 --- a/test/test_api.py +++ b/test/test_api.py @@ -51,7 +51,7 @@ from apprise import PrivacyMode from apprise.locale import LazyTranslation from apprise.locale import gettext_lazy as _ -from apprise.manager_plugins import NotificationManager +from apprise 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 585a037d..847531ad 100644 --- a/test/test_apprise_attachments.py +++ b/test/test_apprise_attachments.py @@ -35,7 +35,7 @@ from os.path import join from os.path import dirname from inspect import cleandoc from apprise import Apprise, AppriseAsset -from apprise.manager_attachment import AttachmentManager +from apprise import AttachmentManager from apprise.apprise_attachment import AppriseAttachment from apprise.attachment import AttachBase from apprise.common import ContentLocation diff --git a/test/test_apprise_cli.py b/test/test_apprise_cli.py index de2ed6c4..2eef233d 100644 --- a/test/test_apprise_cli.py +++ b/test/test_apprise_cli.py @@ -36,7 +36,7 @@ from os.path import dirname from os.path import join from apprise import cli from apprise import NotifyBase -from apprise.manager_plugins import NotificationManager +from apprise import NotificationManager from click.testing import CliRunner from apprise.utils import environ from apprise.locale import gettext_lazy as _ diff --git a/test/test_apprise_config.py b/test/test_apprise_config.py index a0e0b816..9ce71520 100644 --- a/test/test_apprise_config.py +++ b/test/test_apprise_config.py @@ -37,8 +37,8 @@ from apprise import AppriseConfig from apprise import AppriseAsset from apprise.config import ConfigBase from apprise.plugins import NotifyBase -from apprise.manager_plugins import NotificationManager -from apprise.manager_config import ConfigurationManager +from apprise import NotificationManager +from apprise import ConfigurationManager from apprise.config.file import ConfigFile diff --git a/test/test_apprise_utils.py b/test/test_apprise_utils.py index 340f78c9..39293b01 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.manager_plugins import NotificationManager +from apprise import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_asyncio.py b/test/test_asyncio.py index 7d8bf64f..f4930dd9 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.manager_plugins import NotificationManager +from apprise import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_attach_http.py b/test/test_attach_http.py index 71e32719..217ed78f 100644 --- a/test/test_attach_http.py +++ b/test/test_attach_http.py @@ -36,7 +36,7 @@ from os.path import dirname from os.path import getsize from apprise.attachment.http import AttachHTTP from apprise import Apprise, AppriseAttachment -from apprise.manager_plugins import NotificationManager +from apprise import NotificationManager from apprise.plugins import NotifyBase from apprise.common import ContentLocation diff --git a/test/test_config_http.py b/test/test_config_http.py index 79c3c9b8..42b3efd0 100644 --- a/test/test_config_http.py +++ b/test/test_config_http.py @@ -34,7 +34,7 @@ import requests from apprise.common import ConfigFormat from apprise.config.http import ConfigHTTP from apprise.plugins import NotifyBase -from apprise.manager_plugins import NotificationManager +from apprise import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_decorator_notify.py b/test/test_decorator_notify.py index d92986f5..61825042 100644 --- a/test/test_decorator_notify.py +++ b/test/test_decorator_notify.py @@ -35,7 +35,7 @@ from apprise import AppriseConfig from apprise import AppriseAsset from apprise import AppriseAttachment from apprise import common -from apprise.manager_plugins import NotificationManager +from apprise import NotificationManager # Disable logging for a cleaner testing output import logging diff --git a/test/test_notification_manager.py b/test/test_notification_manager.py index 4a09b54c..ee50e092 100644 --- a/test/test_notification_manager.py +++ b/test/test_notification_manager.py @@ -33,7 +33,7 @@ import threading from inspect import cleandoc from apprise import Apprise -from apprise.manager_plugins import NotificationManager +from apprise import NotificationManager from apprise.plugins import NotifyBase # Disable logging for a cleaner testing output