diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-31 11:05:54 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-31 11:05:54 -0700 |
| commit | 83a73ac9b751f6403a43cb341460a46171e0908b (patch) | |
| tree | c60877a9c6896bbefe8fcb51b606a20abac165ee /sleekxmpp/clientxmpp.py | |
| parent | ccb0eeefbd58361283e4e92d75e5d17aa76c70c7 (diff) | |
| parent | a81162edd2434756e21d7f9a79d71d770a43db7b (diff) | |
| download | slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.gz slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.bz2 slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.xz slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index a93afe56..3a5f41bd 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -77,9 +77,6 @@ class ClientXMPP(BaseXMPP): self.plugin_whitelist = plugin_whitelist self.srv_support = SRV_SUPPORT - self.session_started_event = threading.Event() - self.session_started_event.clear() - self.stream_header = "<stream:stream to='%s' %s %s version='1.0'>" % ( self.boundjid.host, "xmlns:stream='%s'" % self.stream_ns, @@ -369,7 +366,7 @@ class ClientXMPP(BaseXMPP): MatchXPath(tls.Proceed.tag_name()), tls_proceed, instream=True)) - self.send(features['starttls']) + self.send(features['starttls'], now=True) return True else: log.warning("The module tlslite is required to log in" +\ @@ -446,8 +443,7 @@ class ClientXMPP(BaseXMPP): resp = sasl.Auth(xmpp) resp['mechanism'] = 'PLAIN' resp['value'] = auth - resp.send() - + resp.send(now=True) return True def _handle_sasl_anonymous(self, xmpp): @@ -479,7 +475,7 @@ class ClientXMPP(BaseXMPP): iq.enable('bind') if self.boundjid.resource: iq['bind']['resource'] = self.boundjid.resource - response = iq.send() + response = iq.send(now=True) self.set_jid(response['bind']['jid']) self.bound = True @@ -502,7 +498,7 @@ class ClientXMPP(BaseXMPP): iq = self.Iq() iq['type'] = 'set' iq.enable('session') - response = iq.send() + response = iq.send(now=True) log.debug("Established Session") self.sessionstarted = True |