From e81683beeee5e7e03e05ad10320ebd1adb30269f Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 16 Dec 2010 15:29:17 -0500 Subject: Some Python 3.1+ compatibility fixes. Originally contributed by filipegiusti. --- sleekxmpp/plugins/xep_0004.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sleekxmpp/plugins/xep_0004.py') 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) -- cgit v1.2.3