diff --git a/plextraktsync/commands/clear_collections.py b/plextraktsync/commands/clear_collections.py index 2261cca1d70..cd8f95b6939 100644 --- a/plextraktsync/commands/clear_collections.py +++ b/plextraktsync/commands/clear_collections.py @@ -1,7 +1,6 @@ import click -from plextraktsync.factory import factory -from plextraktsync.logging import logger +from plextraktsync.factory import factory, logger def clear_collections(confirm, dry_run): diff --git a/plextraktsync/commands/info.py b/plextraktsync/commands/info.py index 256f4ce15b8..842b49bd909 100644 --- a/plextraktsync/commands/info.py +++ b/plextraktsync/commands/info.py @@ -4,8 +4,7 @@ from trakt import __version__ as TRAKT_API_VERSION from plextraktsync.commands.plex_login import has_plex_token -from plextraktsync.factory import factory -from plextraktsync.logging import logger +from plextraktsync.factory import factory, logger from plextraktsync.path import cache_dir, config_dir, log_dir from plextraktsync.version import version as get_version diff --git a/plextraktsync/commands/watch.py b/plextraktsync/commands/watch.py index f7285599b99..d64fe08492f 100644 --- a/plextraktsync/commands/watch.py +++ b/plextraktsync/commands/watch.py @@ -7,9 +7,8 @@ from plextraktsync.decorators.cached_property import cached_property from plextraktsync.events import (ActivityNotification, Error, PlaySessionStateNotification, TimelineEntry) -from plextraktsync.factory import factory +from plextraktsync.factory import factory, logging from plextraktsync.listener import WebSocketListener -from plextraktsync.logging import logging from plextraktsync.media import Media, MediaFactory from plextraktsync.plex_api import PlexApi, PlexLibraryItem from plextraktsync.trakt_api import TraktApi diff --git a/plextraktsync/listener.py b/plextraktsync/listener.py index 4a45f3ead5d..8bcd20006ff 100644 --- a/plextraktsync/listener.py +++ b/plextraktsync/listener.py @@ -3,7 +3,7 @@ from plexapi.server import PlexServer from plextraktsync.events import Error, EventFactory -from plextraktsync.logging import logging +from plextraktsync.factory import logging class EventDispatcher: diff --git a/plextraktsync/plex_server.py b/plextraktsync/plex_server.py index 9132e3c14b2..73dc67807b9 100644 --- a/plextraktsync/plex_server.py +++ b/plextraktsync/plex_server.py @@ -7,8 +7,7 @@ from plextraktsync.config import PLEX_PLATFORM from plextraktsync.decorators.nocache import nocache -from plextraktsync.factory import Factory -from plextraktsync.logging import logging +from plextraktsync.factory import Factory, logging class PlexServerConnection: diff --git a/plextraktsync/trakt_api.py b/plextraktsync/trakt_api.py index d66497303b7..c0242d225bc 100644 --- a/plextraktsync/trakt_api.py +++ b/plextraktsync/trakt_api.py @@ -20,8 +20,7 @@ from plextraktsync.decorators.rate_limit import rate_limit from plextraktsync.decorators.retry import retry from plextraktsync.decorators.time_limit import time_limit -from plextraktsync.factory import factory, logger -from plextraktsync.logging import logging +from plextraktsync.factory import factory, logger, logging from plextraktsync.path import pytrakt_file from plextraktsync.plex_api import PlexGuid, PlexLibraryItem