Use system magic python library where available (e.g. Debian/Ubuntu)

This commit is contained in:
Gianfranco Costamagna 2018-02-14 14:37:13 +01:00
parent e2cc9569e5
commit 750e67c09e
2 changed files with 8 additions and 3 deletions

View File

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

View File

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