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

Missing changes to key/value approach

master
Emmanuelle Vargas-Gonzalez 2018-11-14 15:03:57 -05:00
parent c80f39ceed
commit d6435a18fa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stix2/datastore/memory.py
View File

@ -47,7 +47,7 @@ def _add(store, stix_data=None, allow_custom=True, version=None):
store._data[stix_obj["id"]] = stix_obj store._data[stix_obj["id"]] = stix_obj
else: else:
if stix_obj.id in store._data: if stix_obj["id"] in store._data:
obj_family = store._data[stix_obj["id"]] obj_family = store._data[stix_obj["id"]]
else: else:
obj_family = _ObjectFamily() obj_family = _ObjectFamily()
@ -84,14 +84,14 @@ class _ObjectFamily(object):
self.latest_version = None self.latest_version = None
def add(self, obj): def add(self, obj):
self.all_versions[obj.modified] = obj self.all_versions[obj["modified"]] = obj
if self.latest_version is None or \ if self.latest_version is None or \
obj.modified > self.latest_version.modified: obj["modified"] > self.latest_version["modified"]:
self.latest_version = obj self.latest_version = obj
def __str__(self): def __str__(self):
return "<<{}; latest={}>>".format(self.all_versions, return "<<{}; latest={}>>".format(self.all_versions,
self.latest_version.modified) self.latest_version["modified"])
def __repr__(self): def __repr__(self):
return str(self) return str(self)
@ -192,7 +192,7 @@ class MemorySink(DataSink):
_add(self, stix_data, self.allow_custom, version) _add(self, stix_data, self.allow_custom, version)
add.__doc__ = _add.__doc__ add.__doc__ = _add.__doc__
def save_to_file(self, file_path): def save_to_file(self, file_path, encoding="utf-8"):
file_path = os.path.abspath(file_path) file_path = os.path.abspath(file_path)
all_objs = itertools.chain.from_iterable( all_objs = itertools.chain.from_iterable(