github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-24 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

xep-0004 merge should deal with dictionaries

Browse source
This commit is contained in:
fritzy 2010-08-31 14:44:24 +00:00
parent 00d7952001
commit 6dfea828be
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sleekxmpp/plugins/xep_0004.py
View file

@ -13,6 +13,7 @@ from .. xmlstream.handler.callback import Callback
from .. xmlstream.matcher.xpath import MatchXPath from .. xmlstream.matcher.xpath import MatchXPath
from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
from .. stanza.message import Message from .. stanza.message import Message
import types
class Form(ElementBase): class Form(ElementBase):
@ -199,6 +200,9 @@ class Form(ElementBase):
def merge(self, other): def merge(self, other):
new = copy.copy(self) new = copy.copy(self)
if type(other) == types.DictType:
new.setValues(other)
return new
nfields = new.getFields(use_dict=True) nfields = new.getFields(use_dict=True)
ofields = other.getFields(use_dict=True) ofields = other.getFields(use_dict=True)
nfields.update(ofields) nfields.update(ofields)