From 03889d382ad4b26bf8cfd735dc00c6d85640e87b Mon Sep 17 00:00:00 2001 From: Joxos Date: Sun, 17 Sep 2023 09:25:47 +0800 Subject: [PATCH] import sorted --- pyasync_server/client/client.py | 3 +-- pyasync_server/common/config.py | 6 ------ pyasync_server/server/actions.py | 2 ++ pyasync_server/server/config.py | 7 +++++++ pyasync_server/server/server.py | 3 +-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pyasync_server/client/client.py b/pyasync_server/client/client.py index c111797..b800200 100644 --- a/pyasync_server/client/client.py +++ b/pyasync_server/client/client.py @@ -7,8 +7,7 @@ sys.path.append('..') from common.protocol import on_init, is_framed -from common.utils import * - +from common.utils import show_status, compress, decompress, STATUS, handle_run_main, logger from package import * from config import * diff --git a/pyasync_server/common/config.py b/pyasync_server/common/config.py index 3edab22..2c21935 100644 --- a/pyasync_server/common/config.py +++ b/pyasync_server/common/config.py @@ -12,12 +12,6 @@ class COMPRESSER(Enum): LZMA = auto() -class SQLTYPE(Enum): - NONE=auto() - MYSQL = auto() - MARIADB = auto() - - # configuration starts here compresser = COMPRESSER.NONE default_coding = 'utf-8' diff --git a/pyasync_server/server/actions.py b/pyasync_server/server/actions.py index 55de439..1864811 100644 --- a/pyasync_server/server/actions.py +++ b/pyasync_server/server/actions.py @@ -4,6 +4,8 @@ from common.utils import logger from sys import exit from config import * + +# resolve SQL connection if sql_type == SQLTYPE.MYSQL: from pymysql import connect, Error elif sql_type == SQLTYPE.MARIADB: diff --git a/pyasync_server/server/config.py b/pyasync_server/server/config.py index ed8a978..ef38f9b 100644 --- a/pyasync_server/server/config.py +++ b/pyasync_server/server/config.py @@ -1,5 +1,12 @@ from common.config import * + +class SQLTYPE(Enum): + NONE = auto() + MYSQL = auto() + MARIADB = auto() + + crt_path = 'server.crt' key_path = 'server.key' server_address = ('127.0.0.1', 1145) diff --git a/pyasync_server/server/server.py b/pyasync_server/server/server.py index 0af9659..6f397c4 100644 --- a/pyasync_server/server/server.py +++ b/pyasync_server/server/server.py @@ -7,10 +7,9 @@ sys.path.append('..') from common.protocol import on_init, is_framed +from common.utils import show_status, compress, decompress, STATUS, handle_run_main, logger from package import unpack_and_process -from common.utils import show_status, compress, decompress, STATUS, handle_run_main from config import * -from actions import * # callback style server: