summaryrefslogtreecommitdiff
path: root/sleekxmpp/features/feature_starttls
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-14 17:35:37 -0700
committerLance Stout <lancestout@gmail.com>2012-10-14 17:35:37 -0700
commit7c485c6a8b25b97c7faa4abda6e82200bd09bcae (patch)
treea1f09f31f4bdd2cf8c5bc438fefcc1b3f37a861c /sleekxmpp/features/feature_starttls
parentfc07e23ff8f2eb7c67a1dfeae0db67b182144fca (diff)
parente2e8c4b5dcca3dddfda6e60850a6754018e8f60d (diff)
downloadslixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.tar.gz
slixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.tar.bz2
slixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.tar.xz
slixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_starttls')
-rw-r--r--sleekxmpp/features/feature_starttls/starttls.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/sleekxmpp/features/feature_starttls/starttls.py b/sleekxmpp/features/feature_starttls/starttls.py
index 212b9da5..eb5eee1d 100644
--- a/sleekxmpp/features/feature_starttls/starttls.py
+++ b/sleekxmpp/features/feature_starttls/starttls.py
@@ -54,13 +54,9 @@ class FeatureSTARTTLS(BasePlugin):
return False
elif not self.xmpp.use_tls:
return False
- elif self.xmpp.ssl_support:
+ else:
self.xmpp.send(features['starttls'], now=True)
return True
- else:
- log.warning("The module tlslite is required to log in" + \
- " to some servers, and has not been found.")
- return False
def _handle_starttls_proceed(self, proceed):
"""Restart the XML stream when TLS is accepted."""