Refactor imports and remove redundant paths

This commit updates the sys.path.append and import statements in multiple files for better readability and maintainability. Unused or unnecessary paths were removed, and module imports were restructured for a more logical organization.
pull/375/head v7.1.2.0
Aidaho 2024-02-04 16:09:25 +03:00
parent 2712b25515
commit 80ffaddb6d
2 changed files with 16 additions and 23 deletions

View File

@ -2,17 +2,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json import json
import os import os
import sys
from bottle import route, run, hook, response, request, error from bottle import route, run, hook, response, request, error
import api_funct import api_funct
import app.modules.db.sql as sql
sys.path.append(os.path.dirname(os.path.abspath(__file__))) import app.modules.roxywi.common as roxywi_common
os.chdir(os.path.dirname(os.path.abspath(__file__)))
sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app/'))
import modules.db.sql as sql
import modules.roxywi.common as roxywi_common
_error_auth = '403 Auth before' _error_auth = '403 Auth before'
_allow_origin = '*' _allow_origin = '*'

View File

@ -1,24 +1,23 @@
import os import os
import sys import sys
import json import json
import random
from bottle import request from bottle import request
sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app/')) sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/'))
import modules.db.sql as sql import app.modules.db.sql as sql
import modules.server.ssh as ssh_mod import app.modules.server.ssh as ssh_mod
import modules.server.server as server_mod import app.modules.server.server as server_mod
import modules.config.section as section_mod import app.modules.config.section as section_mod
import modules.config.config as config_mod import app.modules.config.config as config_mod
import modules.config.runtime as runtime_mod import app.modules.config.runtime as runtime_mod
import modules.roxy_wi_tools as roxy_wi_tools import app.modules.roxy_wi_tools as roxy_wi_tools
import modules.roxywi.logs as roxywi_logs import app.modules.roxywi.logs as roxywi_logs
import modules.roxywi.user as roxywi_user import app.modules.roxywi.user as roxywi_user
import modules.roxywi.common as roxywi_common import app.modules.roxywi.common as roxywi_common
import modules.service.common as service_common import app.modules.service.common as service_common
import modules.service.installation as service_mod import app.modules.service.installation as service_mod
import modules.service.ha_cluster as ha_cluster import app.modules.service.ha_cluster as ha_cluster
get_config_var = roxy_wi_tools.GetConfigVar() get_config_var = roxy_wi_tools.GetConfigVar()