MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

fix circular import problem

pull/1/head
Emmanuelle Vargas-Gonzalez 2020-07-22 14:53:37 -04:00
parent c760e04c9a
commit 978aee9a8e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stix2/serialization.py
View File

@ -5,7 +5,8 @@ import datetime as dt
import simplejson as json import simplejson as json
from .base import _STIXBase import stix2.base
from .utils import find_property_index, format_datetime from .utils import find_property_index, format_datetime
@ -21,7 +22,7 @@ class STIXJSONEncoder(json.JSONEncoder):
def default(self, obj): def default(self, obj):
if isinstance(obj, (dt.date, dt.datetime)): if isinstance(obj, (dt.date, dt.datetime)):
return format_datetime(obj) return format_datetime(obj)
elif isinstance(obj, _STIXBase): elif isinstance(obj, stix2.base._STIXBase):
tmp_obj = dict(copy.deepcopy(obj)) tmp_obj = dict(copy.deepcopy(obj))
for prop_name in obj._defaulted_optional_properties: for prop_name in obj._defaulted_optional_properties:
del tmp_obj[prop_name] del tmp_obj[prop_name]
@ -41,7 +42,7 @@ class STIXJSONIncludeOptionalDefaultsEncoder(json.JSONEncoder):
def default(self, obj): def default(self, obj):
if isinstance(obj, (dt.date, dt.datetime)): if isinstance(obj, (dt.date, dt.datetime)):
return format_datetime(obj) return format_datetime(obj)
elif isinstance(obj, _STIXBase): elif isinstance(obj, stix2.base._STIXBase):
return dict(obj) return dict(obj)
else: else:
return super(STIXJSONIncludeOptionalDefaultsEncoder, self).default(obj) return super(STIXJSONIncludeOptionalDefaultsEncoder, self).default(obj)