diff --git a/MANIFEST.in b/MANIFEST.in index b1de9f1..64a9067 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -15,5 +15,3 @@ global-exclude .DS_Store global-exclude .mailmap prune enteletaor_lib/doc* -graft enteletaor_lib/resources/* - diff --git a/enteletaor_lib/libs/hooks/__init__.py b/enteletaor_lib/libs/hooks/__init__.py index 6a47383..c1c62aa 100644 --- a/enteletaor_lib/libs/hooks/__init__.py +++ b/enteletaor_lib/libs/hooks/__init__.py @@ -77,7 +77,10 @@ def find_hooks(): 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): diff --git a/enteletaor_lib/modules/__init__.py b/enteletaor_lib/modules/__init__.py index 2aeb64f..18e9d4e 100644 --- a/enteletaor_lib/modules/__init__.py +++ b/enteletaor_lib/modules/__init__.py @@ -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): diff --git a/enteletaor_lib/modules/redis/__init__.py b/enteletaor_lib/modules/redis/__init__.py index f7311e9..24765b0 100644 --- a/enteletaor_lib/modules/redis/__init__.py +++ b/enteletaor_lib/modules/redis/__init__.py @@ -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 diff --git a/enteletaor_lib/modules/scan/__init__.py b/enteletaor_lib/modules/scan/__init__.py index 7dbb167..e823bfd 100644 --- a/enteletaor_lib/modules/scan/__init__.py +++ b/enteletaor_lib/modules/scan/__init__.py @@ -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 diff --git a/enteletaor_lib/modules/tasks/__init__.py b/enteletaor_lib/modules/tasks/__init__.py index c7baf3f..4ea124e 100644 --- a/enteletaor_lib/modules/tasks/__init__.py +++ b/enteletaor_lib/modules/tasks/__init__.py @@ -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 diff --git a/requirements.txt b/requirements.txt index 51b8190..17ebfb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ six lxml -flask wtforms eventlet colorlog