mirror.MikroTik/MikroWizard.mikroman
0
0
Fork 0
mirror of https://github.com/MikroWizard/mikroman.git synced 2025-07-05 19:44:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Wrong Imports and typo

Browse source
This commit is contained in:
sepehr 2024-12-16 13:04:30 +03:00
parent 58b0ce0c1c
commit a26bd6ae55
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
py/api/api_account.py
View file

@ -11,10 +11,15 @@ from libs.util import ISPRO
from libs.db import db,db_permissions,db_user_group_perm,db_groups,db_sysconfig,db_syslog from libs.db import db,db_permissions,db_user_group_perm,db_groups,db_sysconfig,db_syslog
import json import json
from libs import utilpro, webutil,account from libs import webutil,account
from libs.webutil import app, login_required, get_myself , buildResponse from libs.webutil import app, login_required, get_myself , buildResponse
from libs.mschap3.mschap import nt_password_hash from libs.mschap3.mschap import nt_password_hash
try:
from libs import utilpro
ISPRO=True
except ImportError:
ISPRO=False
pass
import logging import logging
log = logging.getLogger("api") log = logging.getLogger("api")

2
py/libs/firm_lib.py
View file

@ -27,7 +27,7 @@ import urllib.request
import hashlib import hashlib
import netifaces import netifaces
log = logging.getLogger("util") log = logging.getLogger("util")
from libs import utilpro,util from libs import util
try: try:
from libs import utilpro from libs import utilpro
ISPRO=True ISPRO=True

1
py/libs/util.py
View file

@ -27,7 +27,6 @@ import urllib.request
import hashlib import hashlib
import netifaces import netifaces
log = logging.getLogger("util") log = logging.getLogger("util")
from libs import utilpro
try: try:
from libs import utilpro from libs import utilpro
ISPRO=True ISPRO=True

5
py/mules/updater.py
View file

@ -80,14 +80,13 @@ def extract_zip_reload(filename,dst):
p_status = p.wait() p_status = p.wait()
#install requirments #install requirments
try: try:
from libs import utilpro
ISPRO=True
proreqs="/app/py/pro-reqs.txt" proreqs="/app/py/pro-reqs.txt"
with open(proreqs, "r") as f: with open(proreqs, "r") as f:
for line in f: for line in f:
import_or_install(line.strip()) import_or_install(line.strip())
log.info("Installed {}".format(line.strip())) log.info("Installed {}".format(line.strip()))
time.sleep(1) time.sleep(1)
time.sleep(3)
except ImportError: except ImportError:
pass pass
reqs="/app/reqs.txt" reqs="/app/reqs.txt"
@ -101,8 +100,6 @@ def extract_zip_reload(filename,dst):
#touch server reload file /app/reload #touch server reload file /app/reload
Path('/app/reload').touch() Path('/app/reload').touch()
def main(): def main():
while True: while True:
try: try: