summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliris <liris.pp@gmail.com>2014-04-25 07:57:01 +0900
committerliris <liris.pp@gmail.com>2014-04-25 07:57:01 +0900
commit573f9279da4bd0c44b5c209eca5d895bb639d6ff (patch)
tree1c52928917157c4e48fbc3098ef1a7cc89b41f19
parent6f542ff02a166280a803db16430cdb7d109569f7 (diff)
parent1fe931c6d2bdcd5bdd315501e4fdd621fc1d6073 (diff)
downloadwebsocket-client-573f9279da4bd0c44b5c209eca5d895bb639d6ff.tar.gz
Merge branch 'master' of https://github.com/ralphbean/websocket-client into ralphbean-master
-rw-r--r--websocket/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/websocket/__init__.py b/websocket/__init__.py
index 46b0360..8bb9399 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -27,7 +27,11 @@ import socket
try:
import ssl
from ssl import SSLError
- from backports.ssl_match_hostname import match_hostname
+ if hasattr(ssl, "match_hostname"):
+ from ssl import match_hostname
+ else:
+ from backports.ssl_match_hostname import match_hostname
+
HAVE_SSL = True
except ImportError:
# dummy class of SSLError for ssl none-support environment.