From c9bc0e99557d4ba85722be445d43e4113dbf0cb9 Mon Sep 17 00:00:00 2001 From: boyska Date: Fri, 15 Nov 2019 22:22:38 +0100 Subject: [PATCH] imports are both py2 and py3 compatible --- server/cli.py | 6 +++--- server/{techrec.py => db.py} | 0 server/maint.py | 2 +- server/server.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename server/{techrec.py => db.py} (100%) diff --git a/server/cli.py b/server/cli.py index 5b6e3c3..7435ff3 100644 --- a/server/cli.py +++ b/server/cli.py @@ -9,10 +9,10 @@ logger = logging.getLogger('cli') CWD = os.getcwd() -from techrec import forge -from techrec import maint +from . import forge +from . import maint from .config_manager import get_config -from techrec import server +from . import server def pre_check_permissions(): diff --git a/server/techrec.py b/server/db.py similarity index 100% rename from server/techrec.py rename to server/db.py diff --git a/server/maint.py b/server/maint.py index 16d80b1..3eb7d2d 100644 --- a/server/maint.py +++ b/server/maint.py @@ -5,7 +5,7 @@ import logging from sqlalchemy import inspect from .config_manager import get_config -from .techrec import RecDB +from .db import RecDB def cleanold_cmd(options): log = logging.getLogger('cleanold') diff --git a/server/server.py b/server/server.py index b204de3..44c637e 100644 --- a/server/server.py +++ b/server/server.py @@ -14,7 +14,7 @@ botlog.setLevel(logging.INFO) botlog.addHandler(logging.StreamHandler(sys.stdout)) bottle._stderr = lambda x: botlog.info(x.strip()) -from .techrec import Rec, RecDB +from .db import Rec, RecDB from .processqueue import get_process_queue from .forge import create_mp3 from .config_manager import get_config