From c68b69b422480f626ddbc4486686050d7f7f4ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Fri, 29 Dec 2017 16:44:50 +0100
Subject: [PATCH] fix: Last commit was broken...

---
 pymisp/mispevent.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pymisp/mispevent.py b/pymisp/mispevent.py
index 5d5d71f..a7f2eeb 100644
--- a/pymisp/mispevent.py
+++ b/pymisp/mispevent.py
@@ -106,7 +106,7 @@ class MISPAttribute(AbstractMISP):
         """Mark the attribute as deleted (soft delete)"""
         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)"""
         misp_tag = MISPTag()
         if isinstance(tag, str):
@@ -457,7 +457,7 @@ class MISPEvent(AbstractMISP):
         to_return = {'Event': 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)"""
         misp_tag = MISPTag()
         if isinstance(tag, str):
@@ -539,7 +539,7 @@ class MISPEvent(AbstractMISP):
                 return obj
         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"""
         if isinstance(obj, MISPObject):
             self.Object.append(obj)
@@ -721,8 +721,7 @@ class MISPObjectAttribute(MISPAttribute):
         if self.to_ids is None:
             # Same for the to_ids flag
             self.to_ids = self.__definition.get('to_ids')
-        kwargs.update(**self)
-        super(MISPObjectAttribute, self).from_dict(**kwargs)
+        super(MISPObjectAttribute, self).from_dict(**dict(self, **kwargs))
 
     def __repr__(self):
         if hasattr(self, 'value'):