From f434416a1b217e6106cbdea1888c109ca924b555 Mon Sep 17 00:00:00 2001 From: liris Date: Thu, 26 Mar 2015 15:06:34 +0900 Subject: [PATCH] refs #164 --- websocket/_http.py | 3 +-- websocket/_ssl_compat.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/websocket/_http.py b/websocket/_http.py index f612736..a9272f0 100644 --- a/websocket/_http.py +++ b/websocket/_http.py @@ -125,8 +125,7 @@ def _ssl_socket(sock, sslopt): sslopt.update(sslopt) check_hostname = sslopt.pop('check_hostname', True) sock = ssl.wrap_socket(sock, **sslopt) - if (sslopt["cert_reqs"] != ssl.CERT_NONE - and check_hostname): + if (sslopt["cert_reqs"] != ssl.CERT_NONE and check_hostname): match_hostname(sock.getpeercert(), hostname) diff --git a/websocket/_ssl_compat.py b/websocket/_ssl_compat.py index ae893fc..e21c661 100644 --- a/websocket/_ssl_compat.py +++ b/websocket/_ssl_compat.py @@ -20,7 +20,7 @@ Copyright (C) 2010 Hiroki Ohtani(liris) """ -__all__ = ["HAVE_SSL"] +__all__ = ["HAVE_SSL", "SSLError"] try: import ssl @@ -37,5 +37,4 @@ except ImportError: class SSLError(Exception): pass - __all__.append("SSLError") HAVE_SSL = False