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

Improve has_entries, fix tests.

pull/2/head
Raphaël Vinot 2016-10-14 18:24:21 +02:00
parent 9206716c88
commit 14cdb9183a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pytaxonomies/api.py
View File

@ -135,8 +135,10 @@ class Taxonomy(collections.Mapping):
return to_return return to_return
def has_entries(self): def has_entries(self):
if self.predicates.values() and list(self.predicates.values())[0].entries: if self.predicates.values():
return True for p in self.predicates.values():
if p.entries:
return True
return False return False
def __str__(self): def __str__(self):

13
tests/tests.py
View File

@ -50,13 +50,12 @@ class TestPyTaxonomies(unittest.TestCase):
self.taxonomies.search('phish', expanded=True) self.taxonomies.search('phish', expanded=True)
def test_print_classes(self): def test_print_classes(self):
for t in self.taxonomies.values(): for taxonomy in self.taxonomies.values():
if not t.has_entries(): print(taxonomy)
continue for predicate in taxonomy.values():
tax = list(t.values())[0] print(predicate)
print(tax) for entry in predicate.values():
pred = list(tax.values())[0] print(entry)
print(pred)
def test_amountEntries(self): def test_amountEntries(self):
list(self.taxonomies.values())[0].amount_entries() list(self.taxonomies.values())[0].amount_entries()