Merge branch 'develop' into exceptions

This commit is contained in:
Lance Stout 2011-06-08 10:02:38 -07:00
commit 5c1562f36b
2 changed files with 2 additions and 2 deletions

View file

@ -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):
"""

View file

@ -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