Commit e9638d1b authored by Denis Bilenko's avatar Denis Bilenko

server: re-raise the original ImportError when import ssl failed

parent 67774c49
...@@ -48,10 +48,9 @@ class StreamServer(BaseServer): ...@@ -48,10 +48,9 @@ class StreamServer(BaseServer):
try: try:
from gevent.ssl import wrap_socket from gevent.ssl import wrap_socket
except ImportError: except ImportError:
try: wrap_socket = _import_sslold_wrap_socket()
from gevent.sslold import wrap_socket if wrap_socket is None:
except ImportError: raise
raise ImportError('ssl package is required: http://pypi.python.org/pypi/ssl')
self.wrap_socket = wrap_socket self.wrap_socket = wrap_socket
self.ssl_args = ssl_args self.ssl_args = ssl_args
self.ssl_enabled = True self.ssl_enabled = True
...@@ -154,3 +153,12 @@ class StreamServer(BaseServer): ...@@ -154,3 +153,12 @@ class StreamServer(BaseServer):
# used in case of ssl sockets # used in case of ssl sockets
ssl_socket = self.wrap_socket(client_socket, server_side=True, **self.ssl_args) ssl_socket = self.wrap_socket(client_socket, server_side=True, **self.ssl_args)
return self.handle(ssl_socket, address) return self.handle(ssl_socket, address)
def _import_sslold_wrap_socket():
try:
from gevent.sslold import wrap_socket
return wrap_socket
except ImportError:
pass
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment