From e37f9408e758df3c151fa5f79f6f0224d2aeda04 Mon Sep 17 00:00:00 2001 From: David Trattnig <david.trattnig@o94.at> Date: Wed, 18 Mar 2020 11:36:10 +0100 Subject: [PATCH] Moved exceptions to base module. --- guru.py | 2 +- .../auraexceptions.py => modules/base/exceptions.py | 0 modules/communication/liquidsoap/client.py | 2 +- modules/communication/liquidsoap/communicator.py | 2 +- modules/communication/mail.py | 2 +- modules/communication/redis/adapter.py | 2 +- modules/communication/redis/messenger.py | 2 +- modules/monitoring/diskspace_watcher.py | 4 ++-- 8 files changed, 8 insertions(+), 8 deletions(-) rename libraries/exceptions/auraexceptions.py => modules/base/exceptions.py (100%) diff --git a/guru.py b/guru.py index afbae622..32de082f 100755 --- a/guru.py +++ b/guru.py @@ -33,7 +33,7 @@ from argparse import ArgumentParser # own libs from modules.cli_tool.padavan import Padavan -from libraries.exceptions.auraexceptions import PlaylistException +from modules.base.exceptions import PlaylistException from modules.base.config import AuraConfig diff --git a/libraries/exceptions/auraexceptions.py b/modules/base/exceptions.py similarity index 100% rename from libraries/exceptions/auraexceptions.py rename to modules/base/exceptions.py diff --git a/modules/communication/liquidsoap/client.py b/modules/communication/liquidsoap/client.py index 58be72fc..afb451dd 100644 --- a/modules/communication/liquidsoap/client.py +++ b/modules/communication/liquidsoap/client.py @@ -29,7 +29,7 @@ import logging from multiprocessing import Lock -from libraries.exceptions.auraexceptions import LQConnectionError +from modules.base.exceptions import LQConnectionError from libraries.enum.auraenumerations import TerminalColors """ diff --git a/modules/communication/liquidsoap/communicator.py b/modules/communication/liquidsoap/communicator.py index 672f44f5..8f422bd6 100644 --- a/modules/communication/liquidsoap/communicator.py +++ b/modules/communication/liquidsoap/communicator.py @@ -32,7 +32,7 @@ from modules.communication.liquidsoap.initthread import LiquidSoapInitThread from modules.communication.mail import AuraMailer from libraries.enum.auraenumerations import TerminalColors, ScheduleEntryType -from libraries.exceptions.auraexceptions import LQConnectionError +from modules.base.exceptions import LQConnectionError from libraries.exceptions.exception_logger import ExceptionLogger """ diff --git a/modules/communication/mail.py b/modules/communication/mail.py index 4f6e9375..d257b90a 100644 --- a/modules/communication/mail.py +++ b/modules/communication/mail.py @@ -24,7 +24,7 @@ import smtplib from email.message import EmailMessage -from libraries.exceptions.auraexceptions import MailingException +from modules.base.exceptions import MailingException class AuraMailer(): diff --git a/modules/communication/redis/adapter.py b/modules/communication/redis/adapter.py index 6d17b452..b450a197 100644 --- a/modules/communication/redis/adapter.py +++ b/modules/communication/redis/adapter.py @@ -34,7 +34,7 @@ from threading import Event from modules.communication.redis.messenger import RedisMessenger # from modules.communication.connection_tester import ConnectionTester from libraries.database.statestore import RedisStateStore -from libraries.exceptions.auraexceptions import RedisConnectionException +from modules.base.exceptions import RedisConnectionException from libraries.enum.auraenumerations import RedisChannel, TerminalColors, FallbackType diff --git a/modules/communication/redis/messenger.py b/modules/communication/redis/messenger.py index 24ba879a..98cb9909 100644 --- a/modules/communication/redis/messenger.py +++ b/modules/communication/redis/messenger.py @@ -28,7 +28,7 @@ import datetime from libraries.database.statestore import RedisStateStore from modules.communication.mail import AuraMailer -from libraries.exceptions.auraexceptions import PlaylistException +from modules.base.exceptions import PlaylistException from libraries.enum.auraenumerations import RedisChannel from modules.base.logger import AuraLogger diff --git a/modules/monitoring/diskspace_watcher.py b/modules/monitoring/diskspace_watcher.py index f655a8c5..3c157de3 100644 --- a/modules/monitoring/diskspace_watcher.py +++ b/modules/monitoring/diskspace_watcher.py @@ -28,8 +28,8 @@ import threading from collections import namedtuple from modules.communication.mail import AuraMailer -from libraries.exceptions.auraexceptions import MailingException -from libraries.exceptions.auraexceptions import DiskSpaceException +from modules.base.exceptions import MailingException +from modules.base.exceptions import DiskSpaceException # ------------------------------------------------------------------------------------------ # -- GitLab