fix: removed unused imports

fix: improvements for Python 2 support
fix: improvements for pip installation
This commit is contained in:
cr0hn
2016-02-28 18:28:47 +01:00
parent 556d9c5873
commit 549a7bb05a
7 changed files with 17 additions and 14 deletions

View File

@@ -15,5 +15,3 @@ global-exclude .DS_Store
global-exclude .mailmap
prune enteletaor_lib/doc*
graft enteletaor_lib/resources/*

View File

@@ -77,6 +77,9 @@ def find_hooks():
loop_file = loop_file[1:] if loop_file.startswith(".") else loop_file
# Load module info
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

View File

@@ -66,6 +66,9 @@ def find_modules():
loop_file = loop_file[1:] if loop_file.startswith(".") else loop_file
# Load module info
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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +1,5 @@
six
lxml
flask
wtforms
eventlet
colorlog