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

Fix testcases, add support for type in the taxonomy.

pull/2/head
Raphaël Vinot 2017-07-19 17:59:01 +02:00
parent f65248e044
commit 4ccd304440
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pytaxonomies/api.py
View File

@ -73,6 +73,7 @@ class Taxonomy(collections.Mapping):
self.version = self.taxonomy['version'] self.version = self.taxonomy['version']
self.expanded = self.taxonomy.get('expanded') self.expanded = self.taxonomy.get('expanded')
self.refs = self.taxonomy.get('refs') self.refs = self.taxonomy.get('refs')
self.type = self.taxonomy.get('type')
self.__init_predicates() self.__init_predicates()
def __init_predicates(self): def __init_predicates(self):
@ -123,15 +124,13 @@ class Taxonomy(collections.Mapping):
to_return['expanded'] = self.expanded to_return['expanded'] = self.expanded
if self.refs: if self.refs:
to_return['refs'] = self.refs to_return['refs'] = self.refs
if self.type:
to_return['type'] = self.type
p, v = self._json_predicates() p, v = self._json_predicates()
if p: if p:
to_return['predicates'] = p to_return['predicates'] = p
else:
to_return['predicates'] = None
if v: if v:
to_return['values'] = v to_return['values'] = v
else:
to_return['values'] = None
return to_return return to_return
def has_entries(self): def has_entries(self):