From aa3e87384533da48eacae7e6a1ecef8a8e776e7f Mon Sep 17 00:00:00 2001 From: chrisr3d Date: Tue, 4 Jun 2019 11:33:42 +1000 Subject: [PATCH] fix: Making pep8 happy + added joe_import module in the init list --- misp_modules/modules/expansion/__init__.py | 3 +++ misp_modules/modules/expansion/joesandbox_query.py | 4 +--- misp_modules/modules/import_mod/__init__.py | 5 ++++- misp_modules/modules/import_mod/joe_import.py | 3 --- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/misp_modules/modules/expansion/__init__.py b/misp_modules/modules/expansion/__init__.py index f64600a..acf49f2 100644 --- a/misp_modules/modules/expansion/__init__.py +++ b/misp_modules/modules/expansion/__init__.py @@ -1,4 +1,7 @@ from . import _vmray # noqa +import os +import sys +sys.path.append('{}/lib'.format('/'.join((os.path.realpath(__file__)).split('/')[:-3]))) __all__ = ['cuckoo_submit', 'vmray_submit', 'bgpranking', 'circl_passivedns', 'circl_passivessl', 'countrycode', 'cve', 'dns', 'btc_steroids', 'domaintools', 'eupi', diff --git a/misp_modules/modules/expansion/joesandbox_query.py b/misp_modules/modules/expansion/joesandbox_query.py index 225cc16..27ced1b 100644 --- a/misp_modules/modules/expansion/joesandbox_query.py +++ b/misp_modules/modules/expansion/joesandbox_query.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- import jbxapi import json -import os -import sys -sys.path.append('{}/lib'.format('/'.join((os.path.realpath(__file__)).split('/')[:-3]))) from joe_parser import JoeParser misperrors = {'error': 'Error'} @@ -58,6 +55,7 @@ def handler(q=False): def introspection(): return mispattributes + def version(): moduleinfo['config'] = moduleconfig return moduleinfo diff --git a/misp_modules/modules/import_mod/__init__.py b/misp_modules/modules/import_mod/__init__.py index c3eea05..65a7069 100644 --- a/misp_modules/modules/import_mod/__init__.py +++ b/misp_modules/modules/import_mod/__init__.py @@ -1,3 +1,6 @@ from . import _vmray # noqa +import os +import sys +sys.path.append('{}/lib'.format('/'.join((os.path.realpath(__file__)).split('/')[:-3]))) -__all__ = ['vmray_import', 'ocr', 'cuckooimport', 'goamlimport', 'email_import', 'mispjson', 'openiocimport', 'threatanalyzer_import', 'csvimport'] +__all__ = ['vmray_import', 'ocr', 'cuckooimport', 'goamlimport', 'email_import', 'mispjson', 'openiocimport', 'threatanalyzer_import', 'csvimport', 'joe_import'] diff --git a/misp_modules/modules/import_mod/joe_import.py b/misp_modules/modules/import_mod/joe_import.py index d4b9dfb..d1c4d19 100644 --- a/misp_modules/modules/import_mod/joe_import.py +++ b/misp_modules/modules/import_mod/joe_import.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- import base64 import json -import os -import sys -sys.path.append('{}/lib'.format('/'.join((os.path.realpath(__file__)).split('/')[:-3]))) from joe_parser import JoeParser misperrors = {'error': 'Error'}