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

Revert "Simplfy MISPEvent.add_attribute" 

This reverts commit f64f42ac71.
pull/98/head
Raphaël Vinot 2017-07-12 11:24:21 +02:00
parent f64f42ac71
commit 481c8e4790
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pymisp/mispevent.py
View File

@ -593,15 +593,11 @@ class MISPEvent(object):
if not found:
raise Exception('No attribute with UUID/ID {} found.'.format(attribute_id))
def add_attribute(self, **kwargs):
if not kwargs.get('value'):
raise NewAttributeError('The value of the attribute is required.')
if not kwargs.get('type'):
raise NewAttributeError('The type of the attribute is required.')
def add_attribute(self, type_, value, **kwargs):
attribute = MISPAttribute(self.describe_types)
if isinstance(kwargs.get('value'), list):
for a in kwargs.get('value'):
self.add_attribute(kwargs.get('type'), a, **kwargs)
if isinstance(value, list):
for a in value:
self.add_attribute(type_, a, **kwargs)
else:
attribute.set_all_values(type=kwargs.get('type'), value=kwargs.get('value'), **kwargs)
attribute.set_all_values(type=type_, value=value, **kwargs)
self.attributes.append(attribute)