From c2f6f077762282d311a6f876f94cc1a4eb9e805f Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Sun, 20 Jul 2014 20:46:03 +0200 Subject: Make xmlstream use an asyncio loop Scheduled events, connection, TLS handshake (with STARTTLS), read and write on the socket are all done using only asyncio. A lot of threads, and thread-related (and thus useless) things still remain. This is only a first step. --- slixmpp/features/feature_starttls/starttls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'slixmpp/features/feature_starttls/starttls.py') diff --git a/slixmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py index 4b9dd60b..a05f755b 100644 --- a/slixmpp/features/feature_starttls/starttls.py +++ b/slixmpp/features/feature_starttls/starttls.py @@ -52,7 +52,7 @@ class FeatureSTARTTLS(BasePlugin): # We have already negotiated TLS, but the server is # offering it again, against spec. return False - elif not self.xmpp.use_tls: + elif self.xmpp.disable_starttls: return False else: self.xmpp.send(features['starttls'], now=True) @@ -63,4 +63,3 @@ class FeatureSTARTTLS(BasePlugin): log.debug("Starting TLS") if self.xmpp.start_tls(): self.xmpp.features.add('starttls') - raise RestartStream() -- cgit v1.2.3