Merge branch 'develop-1.1' into develop

2 files changed, 22 insertions, 21 deletions

diff --git a/sleekxmpp/plugins/xep_0128/extended_disco.py b/sleekxmpp/plugins/xep_0128/extended_disco.py
index 63b3cfee..5bb78320 100644
--- a/sleekxmpp/plugins/xep_0128/extended_disco.py
+++ b/sleekxmpp/plugins/xep_0128/extended_disco.py
@@ -76,7 +76,7 @@ class xep_0128(base_plugin):
                     as extended information, replacing any
                     existing extensions.
         """
-        self.disco._run_node_handler('set_extended_info', jid, node, kwargs)
+        self.disco._run_node_handler('set_extended_info', jid, node, None, kwargs)
 
     def add_extended_info(self, jid=None, node=None, **kwargs):
         """
@@ -88,7 +88,7 @@ class xep_0128(base_plugin):
             data -- Either a form, or a list of forms to add
                     as extended information.
         """
-        self.disco._run_node_handler('add_extended_info', jid, node, kwargs)
+        self.disco._run_node_handler('add_extended_info', jid, node, None, kwargs)
 
     def del_extended_info(self, jid=None, node=None, **kwargs):
         """
@@ -98,4 +98,4 @@ class xep_0128(base_plugin):
             jid  -- The JID to modify.
             node -- The node to modify.
         """
-        self.disco._run_node_handler('del_extended_info', jid, node, kwargs)
+        self.disco._run_node_handler('del_extended_info', jid, node, None, kwargs)
diff --git a/sleekxmpp/plugins/xep_0128/static.py b/sleekxmpp/plugins/xep_0128/static.py
index 493d9370..427011c0 100644
--- a/sleekxmpp/plugins/xep_0128/static.py
+++ b/sleekxmpp/plugins/xep_0128/static.py
@@ -31,42 +31,43 @@ class StaticExtendedDisco(object):
         """
         self.static = static
 
-    def set_extended_info(self, jid, node, data):
+    def set_extended_info(self, jid, node, ifrom, data):
         """
         Replace the extended identity data for a JID/node combination.
 
         The data parameter may provide:
             data -- Either a single data form, or a list of data forms.
         """
-        self.del_extended_info(jid, node, data)
-        self.add_extended_info(jid, node, data)
+        with self.static.lock:
+            self.del_extended_info(jid, node, ifrom, data)
+            self.add_extended_info(jid, node, ifrom, data)
 
-    def add_extended_info(self, jid, node, data):
+    def add_extended_info(self, jid, node, ifrom, data):
         """
         Add additional extended identity data for a JID/node combination.
 
         The data parameter may provide:
             data -- Either a single data form, or a list of data forms.
         """
-        self.static.add_node(jid, node)
+        with self.static.lock:
+            self.static.add_node(jid, node)
 
-        forms = data.get('data', [])
-        if not isinstance(forms, list):
-            forms = [forms]
+            forms = data.get('data', [])
+            if not isinstance(forms, list):
+                forms = [forms]
 
-        for form in forms:
-            self.static.nodes[(jid, node)]['info'].append(form)
+            info = self.static.get_node(jid, node)['info']
+            for form in forms:
+                info.append(form)
 
-    def del_extended_info(self, jid, node, data):
+    def del_extended_info(self, jid, node, ifrom, data):
         """
         Replace the extended identity data for a JID/node combination.
 
         The data parameter is not used.
         """
-        if (jid, node) not in self.static.nodes:
-            return
-
-        info = self.static.nodes[(jid, node)]['info']
-
-        for form in info['substanza']:
-            info.xml.remove(form.xml)
+        with self.static.lock:
+            if self.static.node_exists(jid, node):
+                info = self.static.get_node(jid, node)['info']
+                for form in info['substanza']:
+                    info.xml.remove(form.xml)