summaryrefslogtreecommitdiffhomepage
path: root/libs/apprise/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'libs/apprise/__init__.py')
-rw-r--r--libs/apprise/__init__.py29
1 files changed, 19 insertions, 10 deletions
diff --git a/libs/apprise/__init__.py b/libs/apprise/__init__.py
index a2511d286..090261086 100644
--- a/libs/apprise/__init__.py
+++ b/libs/apprise/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020 Chris Caron <[email protected]>
+# Copyright (C) 2021 Chris Caron <[email protected]>
# All rights reserved.
#
# This code is licensed under the MIT License.
@@ -23,11 +23,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-__title__ = 'apprise'
-__version__ = '0.8.8'
+__title__ = 'Apprise'
+__version__ = '0.9.6'
__author__ = 'Chris Caron'
__license__ = 'MIT'
-__copywrite__ = 'Copyright (C) 2020 Chris Caron <[email protected]>'
+__copywrite__ = 'Copyright (C) 2021 Chris Caron <[email protected]>'
__email__ = '[email protected]'
__status__ = 'Production'
@@ -41,8 +41,10 @@ from .common import OverflowMode
from .common import OVERFLOW_MODES
from .common import ConfigFormat
from .common import CONFIG_FORMATS
-from .common import ConfigIncludeMode
-from .common import CONFIG_INCLUDE_MODES
+from .common import ContentIncludeMode
+from .common import CONTENT_INCLUDE_MODES
+from .common import ContentLocation
+from .common import CONTENT_LOCATIONS
from .URLBase import URLBase
from .URLBase import PrivacyMode
@@ -55,10 +57,13 @@ from .AppriseAsset import AppriseAsset
from .AppriseConfig import AppriseConfig
from .AppriseAttachment import AppriseAttachment
+# Inherit our logging with our additional entries added to it
+from .logger import logging
+from .logger import logger
+from .logger import LogCapture
+
# Set default logging handler to avoid "No handler found" warnings.
-import logging
-from logging import NullHandler
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
__all__ = [
# Core
@@ -69,6 +74,10 @@ __all__ = [
'NotifyType', 'NotifyImageSize', 'NotifyFormat', 'OverflowMode',
'NOTIFY_TYPES', 'NOTIFY_IMAGE_SIZES', 'NOTIFY_FORMATS', 'OVERFLOW_MODES',
'ConfigFormat', 'CONFIG_FORMATS',
- 'ConfigIncludeMode', 'CONFIG_INCLUDE_MODES',
+ 'ContentIncludeMode', 'CONTENT_INCLUDE_MODES',
+ 'ContentLocation', 'CONTENT_LOCATIONS',
'PrivacyMode',
+
+ # Logging
+ 'logging', 'logger', 'LogCapture',
]