pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into roster

Browse source
This commit is contained in:
Lance Stout 2011-06-08 10:01:52 -07:00
commit 8eb59072b4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/componentxmpp.py
View file

@ -131,7 +131,7 @@ class ComponentXMPP(BaseXMPP):
handshake = ET.Element('{jabber:component:accept}handshake') handshake = ET.Element('{jabber:component:accept}handshake')
handshake.text = hashlib.sha1(pre_hash).hexdigest().lower() handshake.text = hashlib.sha1(pre_hash).hexdigest().lower()
self.send_xml(handshake) self.send_xml(handshake, now=True)
def _handle_handshake(self, xml): def _handle_handshake(self, xml):
""" """

2
sleekxmpp/plugins/xep_0050/adhoc.py
View file

@ -171,7 +171,7 @@ class xep_0050(base_plugin):
""" """
if jid is None: if jid is None:
jid = self.xmpp.boundjid jid = self.xmpp.boundjid
elif isinstance(jid, str): elif not isinstance(jid, JID):
jid = JID(jid) jid = JID(jid)
item_jid = jid.full item_jid = jid.full