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

fix: Last commit was broken...

pull/165/head
Raphaël Vinot 2017-12-29 16:44:50 +01:00
parent 6b81e5ddba
commit c68b69b422
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pymisp/mispevent.py
View File

@ -106,7 +106,7 @@ class MISPAttribute(AbstractMISP):
"""Mark the attribute as deleted (soft delete)""" """Mark the attribute as deleted (soft delete)"""
self.deleted = True self.deleted = True
def add_tag(self, tag): def add_tag(self, **tag):
"""Add a tag to the attribute (by name or a MISPTag object)""" """Add a tag to the attribute (by name or a MISPTag object)"""
misp_tag = MISPTag() misp_tag = MISPTag()
if isinstance(tag, str): if isinstance(tag, str):
@ -457,7 +457,7 @@ class MISPEvent(AbstractMISP):
to_return = {'Event': to_return} to_return = {'Event': to_return}
return to_return return to_return
def add_tag(self, tag): def add_tag(self, **tag):
"""Add a tag to the attribute (by name or a MISPTag object)""" """Add a tag to the attribute (by name or a MISPTag object)"""
misp_tag = MISPTag() misp_tag = MISPTag()
if isinstance(tag, str): if isinstance(tag, str):
@ -539,7 +539,7 @@ class MISPEvent(AbstractMISP):
return obj return obj
raise InvalidMISPObject('Object with {} does not exists in ths event'.format(object_id)) raise InvalidMISPObject('Object with {} does not exists in ths event'.format(object_id))
def add_object(self, obj): def add_object(self, **obj):
"""Add an object to the Event, either by passing a MISPObject, or a dictionary""" """Add an object to the Event, either by passing a MISPObject, or a dictionary"""
if isinstance(obj, MISPObject): if isinstance(obj, MISPObject):
self.Object.append(obj) self.Object.append(obj)
@ -721,8 +721,7 @@ class MISPObjectAttribute(MISPAttribute):
if self.to_ids is None: if self.to_ids is None:
# Same for the to_ids flag # Same for the to_ids flag
self.to_ids = self.__definition.get('to_ids') self.to_ids = self.__definition.get('to_ids')
kwargs.update(**self) super(MISPObjectAttribute, self).from_dict(**dict(self, **kwargs))
super(MISPObjectAttribute, self).from_dict(**kwargs)
def __repr__(self): def __repr__(self):
if hasattr(self, 'value'): if hasattr(self, 'value'):