From 3a6290870363441a5664deaea9a1c902c72cb7ab Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 8 Jun 2011 10:00:01 -0700 Subject: [PATCH 1/2] Send component handshake immediately. --- sleekxmpp/componentxmpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py index 8c380ddc..f9e7da4d 100644 --- a/sleekxmpp/componentxmpp.py +++ b/sleekxmpp/componentxmpp.py @@ -129,7 +129,7 @@ class ComponentXMPP(BaseXMPP): handshake = ET.Element('{jabber:component:accept}handshake') handshake.text = hashlib.sha1(pre_hash).hexdigest().lower() - self.send_xml(handshake) + self.send_xml(handshake, now=True) def _handle_handshake(self, xml): """ From 4266ee0fa4b2520ed930047ea73d6ac82d9b1f83 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 8 Jun 2011 10:00:28 -0700 Subject: [PATCH 2/2] Fix XEP-0050 issue with Unicode string type checking. --- sleekxmpp/plugins/xep_0050/adhoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py index fe964e96..72c6c513 100644 --- a/sleekxmpp/plugins/xep_0050/adhoc.py +++ b/sleekxmpp/plugins/xep_0050/adhoc.py @@ -171,7 +171,7 @@ class xep_0050(base_plugin): """ if jid is None: jid = self.xmpp.boundjid - elif isinstance(jid, str): + elif not isinstance(jid, JID): jid = JID(jid) item_jid = jid.full