diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-08 10:02:38 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-08 10:02:38 -0700 |
| commit | 5c1562f36b833866e67d8ea8fb61862afbc5a0e4 (patch) | |
| tree | 62a692154b8d28527d377e8307aff60a03e99c6f /sleekxmpp | |
| parent | 20d053807da1f59a2f7507fb7bb3845d31e27445 (diff) | |
| parent | 4266ee0fa4b2520ed930047ea73d6ac82d9b1f83 (diff) | |
| download | slixmpp-5c1562f36b833866e67d8ea8fb61862afbc5a0e4.tar.gz slixmpp-5c1562f36b833866e67d8ea8fb61862afbc5a0e4.tar.bz2 slixmpp-5c1562f36b833866e67d8ea8fb61862afbc5a0e4.tar.xz slixmpp-5c1562f36b833866e67d8ea8fb61862afbc5a0e4.zip | |
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/componentxmpp.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0050/adhoc.py | 2 |
2 files changed, 2 insertions, 2 deletions
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): """ 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 |