From 5d9a1e87a7e75562ae62b8b7f4acd9b07e096111 Mon Sep 17 00:00:00 2001 From: Kumi Date: Mon, 19 Sep 2022 18:05:58 +0000 Subject: [PATCH] Use relative imports --- src/contentmonster/classes/config.py | 6 +++--- src/contentmonster/classes/directory.py | 2 +- src/contentmonster/classes/doghandler.py | 2 +- src/contentmonster/classes/file.py | 4 ++-- src/contentmonster/classes/remotefile.py | 2 +- src/contentmonster/classes/retry.py | 2 +- src/contentmonster/classes/shorethread.py | 10 +++++----- src/contentmonster/classes/vessel.py | 6 +++--- src/contentmonster/classes/vesselthread.py | 14 +++++++------- src/contentmonster/worker.py | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/contentmonster/classes/config.py b/src/contentmonster/classes/config.py index 284f592..1a6fb0b 100644 --- a/src/contentmonster/classes/config.py +++ b/src/contentmonster/classes/config.py @@ -3,9 +3,9 @@ import configparser from pathlib import Path from typing import Union -from classes.vessel import Vessel -from classes.directory import Directory -from classes.database import Database +from .vessel import Vessel +from .directory import Directory +from .database import Database class MonsterConfig: diff --git a/src/contentmonster/classes/directory.py b/src/contentmonster/classes/directory.py index 4cba8f7..a1274f8 100644 --- a/src/contentmonster/classes/directory.py +++ b/src/contentmonster/classes/directory.py @@ -1,4 +1,4 @@ -from classes.file import File +from .file import File import os import pathlib diff --git a/src/contentmonster/classes/doghandler.py b/src/contentmonster/classes/doghandler.py index 79905d9..6c6b737 100644 --- a/src/contentmonster/classes/doghandler.py +++ b/src/contentmonster/classes/doghandler.py @@ -4,7 +4,7 @@ from watchdog.events import (FileSystemEventHandler, FileSystemEvent, from multiprocessing import Queue -from classes.logger import Logger +from .logger import Logger import os.path import time diff --git a/src/contentmonster/classes/file.py b/src/contentmonster/classes/file.py index 69ac1a0..2af6cd8 100644 --- a/src/contentmonster/classes/file.py +++ b/src/contentmonster/classes/file.py @@ -1,5 +1,5 @@ -from classes.chunk import Chunk -from classes.database import Database +from .chunk import Chunk +from .database import Database from typing import Optional diff --git a/src/contentmonster/classes/remotefile.py b/src/contentmonster/classes/remotefile.py index 6affbc0..3e7e0a4 100644 --- a/src/contentmonster/classes/remotefile.py +++ b/src/contentmonster/classes/remotefile.py @@ -1,4 +1,4 @@ -from const import STATUS_COMPLETE, STATUS_START +from ..const import STATUS_COMPLETE, STATUS_START class RemoteFile: diff --git a/src/contentmonster/classes/retry.py b/src/contentmonster/classes/retry.py index 9894977..60d4b90 100644 --- a/src/contentmonster/classes/retry.py +++ b/src/contentmonster/classes/retry.py @@ -1,7 +1,7 @@ from paramiko.ssh_exception import SSHException, NoValidConnectionsError from socket import timeout -from classes.logger import Logger +from .logger import Logger class retry: diff --git a/src/contentmonster/classes/shorethread.py b/src/contentmonster/classes/shorethread.py index 2ae34c1..4457d61 100644 --- a/src/contentmonster/classes/shorethread.py +++ b/src/contentmonster/classes/shorethread.py @@ -1,8 +1,8 @@ -from classes.config import MonsterConfig -from classes.doghandler import DogHandler -from classes.directory import Directory -from classes.database import Database -from classes.logger import Logger +from .config import MonsterConfig +from .doghandler import DogHandler +from .directory import Directory +from .database import Database +from .logger import Logger from watchdog.observers import Observer diff --git a/src/contentmonster/classes/vessel.py b/src/contentmonster/classes/vessel.py index 985dbed..5d9669d 100644 --- a/src/contentmonster/classes/vessel.py +++ b/src/contentmonster/classes/vessel.py @@ -1,6 +1,6 @@ -from classes.connection import Connection -from classes.database import Database -from classes.file import File +from .connection import Connection +from .database import Database +from .file import File from paramiko.ssh_exception import SSHException diff --git a/src/contentmonster/classes/vesselthread.py b/src/contentmonster/classes/vesselthread.py index 9478a1b..8583777 100644 --- a/src/contentmonster/classes/vesselthread.py +++ b/src/contentmonster/classes/vesselthread.py @@ -1,13 +1,13 @@ from multiprocessing import Process from typing import NoReturn, Optional -from classes.vessel import Vessel -from classes.remotefile import RemoteFile -from classes.retry import retry -from classes.database import Database -from classes.logger import Logger -from classes.file import File -from const import STATUS_COMPLETE, STATUS_START +from .vessel import Vessel +from .remotefile import RemoteFile +from .retry import retry +from .database import Database +from .logger import Logger +from .file import File +from ..const import STATUS_COMPLETE, STATUS_START import time diff --git a/src/contentmonster/worker.py b/src/contentmonster/worker.py index 5f4f98d..5ea85ad 100755 --- a/src/contentmonster/worker.py +++ b/src/contentmonster/worker.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from classes.config import MonsterConfig -from classes.vesselthread import VesselThread -from classes.shorethread import ShoreThread +from .classes.config import MonsterConfig +from .classes.vesselthread import VesselThread +from .classes.shorethread import ShoreThread from multiprocessing import Manager