fix for ssl unavialable environmnet
This commit is contained in:
@@ -3,7 +3,12 @@
|
|||||||
|
|
||||||
import base64
|
import base64
|
||||||
import socket
|
import socket
|
||||||
import ssl
|
try:
|
||||||
|
from ssl import SSLError
|
||||||
|
except ImportError:
|
||||||
|
# dummy class of SSLError for ssl none-support environment.
|
||||||
|
class SSLError(Exception):
|
||||||
|
pass
|
||||||
import unittest
|
import unittest
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
@@ -191,7 +196,7 @@ class WebSocketTest(unittest.TestCase):
|
|||||||
s.add_packet("foo")
|
s.add_packet("foo")
|
||||||
s.add_packet(socket.timeout())
|
s.add_packet(socket.timeout())
|
||||||
s.add_packet("bar")
|
s.add_packet("bar")
|
||||||
s.add_packet(ssl.SSLError("The read operation timed out"))
|
s.add_packet(SSLError("The read operation timed out"))
|
||||||
s.add_packet("baz")
|
s.add_packet("baz")
|
||||||
with self.assertRaises(ws.WebSocketTimeoutException):
|
with self.assertRaises(ws.WebSocketTimeoutException):
|
||||||
data = sock._recv_strict(9)
|
data = sock._recv_strict(9)
|
||||||
|
@@ -24,8 +24,13 @@ import socket
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
import ssl
|
import ssl
|
||||||
|
from ssl import SSLError
|
||||||
HAVE_SSL = True
|
HAVE_SSL = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
# dummy class of SSLError for ssl none-support environment.
|
||||||
|
class SSLError(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
HAVE_SSL = False
|
HAVE_SSL = False
|
||||||
|
|
||||||
from urlparse import urlparse
|
from urlparse import urlparse
|
||||||
@@ -705,7 +710,7 @@ class WebSocket(object):
|
|||||||
bytes = self.sock.recv(bufsize)
|
bytes = self.sock.recv(bufsize)
|
||||||
except socket.timeout as e:
|
except socket.timeout as e:
|
||||||
raise WebSocketTimeoutException(e.message)
|
raise WebSocketTimeoutException(e.message)
|
||||||
except ssl.SSLError as e:
|
except SSLError as e:
|
||||||
if e.message == "The read operation timed out":
|
if e.message == "The read operation timed out":
|
||||||
raise WebSocketTimeoutException(e.message)
|
raise WebSocketTimeoutException(e.message)
|
||||||
else:
|
else:
|
||||||
|
Reference in New Issue
Block a user