summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2018-08-07 23:30:06 +0200
committermathieui <mathieui@mathieui.net>2018-08-07 23:30:41 +0200
commit20107ad516640a6f7bc8827ca85020fade18344d (patch)
tree0730ffdc0d19a398cb93c2a90ce3db6e3a5d10aa
parent7738a01311bdac1575dea89bda9eb9dac55debc0 (diff)
downloadslixmpp-20107ad516640a6f7bc8827ca85020fade18344d.tar.gz
slixmpp-20107ad516640a6f7bc8827ca85020fade18344d.tar.bz2
slixmpp-20107ad516640a6f7bc8827ca85020fade18344d.tar.xz
slixmpp-20107ad516640a6f7bc8827ca85020fade18344d.zip
features/starttls: handle the case where the socket is an sslobject
Thanks pep.
-rw-r--r--slixmpp/features/feature_mechanisms/mechanisms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py
index 27877e67..30449de0 100644
--- a/slixmpp/features/feature_mechanisms/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/mechanisms.py
@@ -116,7 +116,7 @@ class FeatureMechanisms(BasePlugin):
if value == 'encrypted':
if 'starttls' in self.xmpp.features:
result[value] = True
- elif isinstance(self.xmpp.socket, ssl.SSLSocket):
+ elif isinstance(self.xmpp.socket, (ssl.SSLSocket, ssl.SSLObject)):
result[value] = True
else:
result[value] = False