MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: Py3.5 compat

pull/202/merge
Raphaël Vinot 2018-08-08 11:19:24 +02:00
parent 3b42497967
commit 44344913f8
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/abstract.py
View File

@ -16,7 +16,7 @@ from .exceptions import PyMISPInvalidFormat
logger = logging.getLogger('pymisp') logger = logging.getLogger('pymisp')
if six.PY2: if six.PY2:
logger.warning("You're using python 2, it is strongly recommended to use python >=3.5") logger.warning("You're using python 2, it is strongly recommended to use python >=3.6")
# This is required because Python 2 is a pain. # This is required because Python 2 is a pain.
from datetime import tzinfo, timedelta from datetime import tzinfo, timedelta

34
pymisp/mispevent.py
View File

@ -23,7 +23,7 @@ logger = logging.getLogger('pymisp')
if six.PY2: if six.PY2:
logger.warning("You're using python 2, it is strongly recommended to use python >=3.5") logger.warning("You're using python 2, it is strongly recommended to use python >=3.6")
# This is required because Python 2 is a pain. # This is required because Python 2 is a pain.
from datetime import tzinfo, timedelta from datetime import tzinfo, timedelta
@ -40,6 +40,13 @@ if six.PY2:
def dst(self, dt): def dst(self, dt):
return timedelta(0) return timedelta(0)
if (3, 0) <= sys.version_info < (3, 6):
OLD_PY3 = True
else:
OLD_PY3 = False
try: try:
from dateutil.parser import parse from dateutil.parser import parse
except ImportError: except ImportError:
@ -94,7 +101,10 @@ class MISPAttribute(AbstractMISP):
if not describe_types: if not describe_types:
ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data') ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
with open(os.path.join(ressources_path, 'describeTypes.json'), 'rb') as f: with open(os.path.join(ressources_path, 'describeTypes.json'), 'rb') as f:
t = json.load(f) if OLD_PY3:
t = json.loads(f.read())
else:
t = json.load(f)
describe_types = t['result'] describe_types = t['result']
self.__categories = describe_types['categories'] self.__categories = describe_types['categories']
self._types = describe_types['types'] self._types = describe_types['types']
@ -352,13 +362,22 @@ class MISPEvent(AbstractMISP):
ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data') ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
if strict_validation: if strict_validation:
with open(os.path.join(ressources_path, 'schema.json'), 'rb') as f: with open(os.path.join(ressources_path, 'schema.json'), 'rb') as f:
self.__json_schema = json.load(f) if OLD_PY3:
self.__json_schema = json.loads(f.read())
else:
self.__json_schema = json.load(f)
else: else:
with open(os.path.join(ressources_path, 'schema-lax.json'), 'rb') as f: with open(os.path.join(ressources_path, 'schema-lax.json'), 'rb') as f:
self.__json_schema = json.load(f) if OLD_PY3:
self.__json_schema = json.loads(f.read())
else:
self.__json_schema = json.load(f)
if not describe_types: if not describe_types:
with open(os.path.join(ressources_path, 'describeTypes.json'), 'rb') as f: with open(os.path.join(ressources_path, 'describeTypes.json'), 'rb') as f:
t = json.load(f) if OLD_PY3:
t = json.loads(f.read())
else:
t = json.load(f)
describe_types = t['result'] describe_types = t['result']
self._types = describe_types['types'] self._types = describe_types['types']
@ -898,7 +917,10 @@ class MISPObject(AbstractMISP):
self._known_template = False self._known_template = False
if self._known_template: if self._known_template:
with open(template_path, 'rb') as f: with open(template_path, 'rb') as f:
self._definition = json.load(f) if OLD_PY3:
self._definition = json.loads(f.read())
else:
self._definition = json.load(f)
setattr(self, 'meta-category', self._definition['meta-category']) setattr(self, 'meta-category', self._definition['meta-category'])
self.template_uuid = self._definition['uuid'] self.template_uuid = self._definition['uuid']
self.description = self._definition['description'] self.description = self._definition['description']