diff --git a/lib/core/common.py b/lib/core/common.py index 67631b110..69b2ef234 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -166,7 +166,10 @@ from lib.utils.sqlalchemy import _sqlalchemy from thirdparty.clientform.clientform import ParseResponse from thirdparty.clientform.clientform import ParseError from thirdparty.colorama.initialise import init as coloramainit -from thirdparty.magic import magic +try: + import magic +except: + from thirdparty.magic import magic from thirdparty.odict.odict import OrderedDict from thirdparty.termcolor.termcolor import colored diff --git a/lib/core/dump.py b/lib/core/dump.py index 33f68e63d..d276d302b 100644 --- a/lib/core/dump.py +++ b/lib/core/dump.py @@ -48,8 +48,10 @@ from lib.core.settings import TRIM_STDOUT_DUMP_SIZE from lib.core.settings import UNICODE_ENCODING from lib.core.settings import UNSAFE_DUMP_FILEPATH_REPLACEMENT from lib.core.settings import WINDOWS_RESERVED_NAMES -from thirdparty.magic import magic - +try: + import magic +except: + from thirdparty.magic import magic from extra.safe2bin.safe2bin import safechardecode class Dump(object):