diff options
author | mathieui <mathieui@mathieui.net> | 2014-10-30 19:49:26 +0100 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2014-10-30 19:49:26 +0100 |
commit | e862c47b8b9d5de2552c55f3f84704eb260f91c5 (patch) | |
tree | 75b5721a580266eddfd53fdfc575a8ab4eec8957 | |
parent | 4a8fe56470245796e76ccd37aa9a5ea07ebb3440 (diff) | |
download | slixmpp-e862c47b8b9d5de2552c55f3f84704eb260f91c5.tar.gz slixmpp-e862c47b8b9d5de2552c55f3f84704eb260f91c5.tar.bz2 slixmpp-e862c47b8b9d5de2552c55f3f84704eb260f91c5.tar.xz slixmpp-e862c47b8b9d5de2552c55f3f84704eb260f91c5.zip |
Remove the ssl_version option, as the defaults in python3.4 are sane
-rw-r--r-- | slixmpp/xmlstream/xmlstream.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py index ff5a3d26..aa0e80fd 100644 --- a/slixmpp/xmlstream/xmlstream.py +++ b/slixmpp/xmlstream/xmlstream.py @@ -103,13 +103,6 @@ class XMLStream(object): self.ssl_context = ssl.create_default_context() self.ssl_context.check_hostname = False self.ssl_context.verify_mode = ssl.CERT_NONE - #: Most XMPP servers support TLSv1, but OpenFire in particular - #: does not work well with it. For OpenFire, set - #: :attr:`ssl_version` to use ``SSLv23``:: - #: - #: import ssl - #: xmpp.ssl_version = ssl.PROTOCOL_SSLv23 - self.ssl_version = ssl.PROTOCOL_TLSv1 # The event to trigger when the create_connection() succeeds. It can # be "connected" or "tls_success" depending on the step we are at. |