mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Fix circular imports
I'm a silly
This commit is contained in:
parent
cb3379a316
commit
affcc14245
@ -2,17 +2,17 @@ import datetime
|
||||
import logging
|
||||
import sys
|
||||
|
||||
from app.classes.shared.helpers import helper
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
try:
|
||||
from colorama import init
|
||||
from termcolor import colored
|
||||
|
||||
except ModuleNotFoundError as e:
|
||||
helper.auto_installer_fix(e)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
except ModuleNotFoundError as ex:
|
||||
logger.critical(f"Import Error: Unable to load {ex.name} module", exc_info=True)
|
||||
print(f"Import Error: Unable to load {ex.name} module")
|
||||
from app.classes.shared.installer import installer
|
||||
installer.do_install()
|
||||
class Console:
|
||||
|
||||
def __init__(self):
|
||||
|
@ -22,9 +22,10 @@ import psutil
|
||||
from app.classes.shared.console import console
|
||||
from app.classes.shared.installer import installer
|
||||
from app.classes.shared.file_helpers import file_helper
|
||||
from app.classes.shared.helpers import helper
|
||||
from app.classes.web.websocket_helper import websocket_helper
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
try:
|
||||
import requests
|
||||
from requests import get
|
||||
@ -32,9 +33,9 @@ try:
|
||||
from argon2 import PasswordHasher
|
||||
|
||||
except ModuleNotFoundError as err:
|
||||
helper.auto_installer_fix(err)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.critical(f"Import Error: Unable to load {err.name} module", exc_info=True)
|
||||
print(f"Import Error: Unable to load {err.name} module")
|
||||
installer.do_install()
|
||||
|
||||
class Helpers:
|
||||
allowed_quotes = [
|
||||
|
Loading…
Reference in New Issue
Block a user