summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-01-12 08:55:33 -0500
committerLance Stout <lancestout@gmail.com>2011-01-12 08:55:33 -0500
commitba0d699d831975eb4c0f9e5e441bba2972f91806 (patch)
treecbf2da291278271fdeba874d207bb664ac95504c /sleekxmpp
parentc6ac40c47655b035c11a3fcd5d40ddf24619934b (diff)
downloadslixmpp-ba0d699d831975eb4c0f9e5e441bba2972f91806.tar.gz
slixmpp-ba0d699d831975eb4c0f9e5e441bba2972f91806.tar.bz2
slixmpp-ba0d699d831975eb4c0f9e5e441bba2972f91806.tar.xz
slixmpp-ba0d699d831975eb4c0f9e5e441bba2972f91806.zip
Fix ordering error in Iq._set_stanza_values.
If iq['query'] was set before a plugin that used the query element was set, then the query element was duplicated.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/stanza/iq.py26
1 files changed, 26 insertions, 0 deletions
diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py
index 906e6648..6388346c 100644
--- a/sleekxmpp/stanza/iq.py
+++ b/sleekxmpp/stanza/iq.py
@@ -199,3 +199,29 @@ class Iq(RootStanza):
return waitfor.wait(timeout)
else:
return StanzaBase.send(self)
+
+ def _set_stanza_values(self, values):
+ """
+ Set multiple stanza interface values using a dictionary.
+
+ Stanza plugin values may be set usind nested dictionaries.
+
+ If the interface 'query' is given, then it will be set
+ last to avoid duplication of the <query /> element.
+
+ Overrides ElementBase._set_stanza_values.
+
+ Arguments:
+ values -- A dictionary mapping stanza interface with values.
+ Plugin interfaces may accept a nested dictionary that
+ will be used recursively.
+ """
+ query = values.get('query', '')
+ if query:
+ del values['query']
+ StanzaBase._set_stanza_values(self, values)
+ self['query'] = query
+ else:
+ StanzaBase._set_stanza_values(self, values)
+ return self
+