From 314cb006e01f1bada32909e504bbf79b119ca8cb Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sun, 23 Jan 2011 17:50:09 -0800 Subject: [PATCH] Fixes #73, thanks to Ruijun Luo for the report. --- AUTHORS | 1 + eventlet/convenience.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 92e0a1d..7e7a149 100644 --- a/AUTHORS +++ b/AUTHORS @@ -68,3 +68,4 @@ Thanks To * Alexey Borzenkov, for finding and fixing issues with Windows error detection (#66, #69), reducing dependencies in zeromq hub (#71) * Anonymous, finding and fixing error in websocket chat example (#70) * Edward George, finding and fixing an issue in the [e]poll hubs (#74) +* Ruijun Luo, figuring out incorrect openssl import for wrap_ssl (#73) diff --git a/eventlet/convenience.py b/eventlet/convenience.py index f199fbc..26a80d9 100644 --- a/eventlet/convenience.py +++ b/eventlet/convenience.py @@ -119,8 +119,8 @@ try: wrap_ssl_impl = ssl.wrap_socket except ImportError: # < 2.6, trying PyOpenSSL - from eventlet.green.OpenSSL import SSL try: + from eventlet.green.OpenSSL import SSL def wrap_ssl_impl(sock, keyfile=None, certfile=None, server_side=False, cert_reqs=None, ssl_version=None, ca_certs=None, do_handshake_on_connect=True,