fix: removed unused imports
fix: improvements for Python 2 support fix: improvements for pip installation
This commit is contained in:
@@ -66,7 +66,10 @@ def find_modules():
|
||||
loop_file = loop_file[1:] if loop_file.startswith(".") else loop_file
|
||||
|
||||
# Load module info
|
||||
classes = __import__(loop_file, globals=globals(), locals=locals(), level=loop_file.count("."))
|
||||
try:
|
||||
classes = __import__("%s.%s" % (__package__, loop_file), globals=globals(), locals=locals(), level=loop_file.count("."))
|
||||
except ImportError:
|
||||
classes = __import__(loop_file, globals=globals(), locals=locals(), level=loop_file.count("."))
|
||||
|
||||
# Get Modules instances
|
||||
for m in dir(classes):
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
import logging
|
||||
|
||||
from modules import IModule
|
||||
from libs.core.models import StringField, IntegerField
|
||||
from libs.core.structs import CommonData
|
||||
from .. import IModule
|
||||
from ...libs.core.structs import CommonData
|
||||
from ...libs.core.models import StringField, IntegerField
|
||||
|
||||
from .redis_dump import action_redis_dump
|
||||
from .redis_shell import action_redis_shell
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
import logging
|
||||
|
||||
from modules import IModule
|
||||
from .. import IModule
|
||||
|
||||
from libs.core.structs import CommonData
|
||||
from libs.core.models import StringField, BoolField, IntegerField, FloatField
|
||||
from ...libs.core.structs import CommonData
|
||||
from ...libs.core.models import StringField, BoolField, IntegerField, FloatField
|
||||
|
||||
from .scan_main import action_scan_main
|
||||
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
|
||||
import logging
|
||||
|
||||
from modules import IModule
|
||||
from .. import IModule
|
||||
|
||||
from libs.core.structs import CommonData
|
||||
from libs.core.models import StringField, SelectField
|
||||
from ...libs.core.structs import CommonData
|
||||
from ...libs.core.models import StringField, SelectField
|
||||
|
||||
from .cmd_actions import parser_proc_raw_dump, parser_proc_list_process, parser_proc_inject_process
|
||||
from .proc_remove import action_proc_remove
|
||||
|
||||
Reference in New Issue
Block a user