import sorted

Joxos · Sep 17, 2023 · 03889d3 · 03889d3
1 parent ed7c68f
commit 03889d3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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: