diff options
| author | Lance Stout <lancestout@gmail.com> | 2010-12-16 22:03:56 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2010-12-16 22:03:56 -0500 |
| commit | adade2e5eccf5a0c48b0b6541fc3d990d732710c (patch) | |
| tree | 9d5bd167058070bfe2b90a7a093e53978a4e29ed /sleekxmpp/plugins/xep_0004.py | |
| parent | c16913c99929a6a5a57611ec8a1757e3e82d4a45 (diff) | |
| parent | cbc42c29fb02a6fd22a0c303e8d02364545c86cf (diff) | |
| download | slixmpp-adade2e5eccf5a0c48b0b6541fc3d990d732710c.tar.gz slixmpp-adade2e5eccf5a0c48b0b6541fc3d990d732710c.tar.bz2 slixmpp-adade2e5eccf5a0c48b0b6541fc3d990d732710c.tar.xz slixmpp-adade2e5eccf5a0c48b0b6541fc3d990d732710c.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/plugins/xep_0004.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0004.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0004.py b/sleekxmpp/plugins/xep_0004.py index b8b7ebfa..5d41d269 100644 --- a/sleekxmpp/plugins/xep_0004.py +++ b/sleekxmpp/plugins/xep_0004.py @@ -13,7 +13,6 @@ from .. xmlstream.handler.callback import Callback from .. xmlstream.matcher.xpath import MatchXPath from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID from .. stanza.message import Message -import types log = logging.getLogger(__name__) @@ -203,7 +202,7 @@ class Form(ElementBase): def merge(self, other): new = copy.copy(self) - if type(other) == types.DictType: + if type(other) == dict: new.setValues(other) return new nfields = new.getFields(use_dict=True) |