openstack/deb-python-eventlet
Code Issues Proposed changes

Fixes #73, thanks to Ruijun Luo for the report.

Browse Source
This commit is contained in:
Ryan Williams
2011-01-23 17:50:09 -08:00
parent ba6960d141
commit 314cb006e0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -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) * 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) * Anonymous, finding and fixing error in websocket chat example (#70)
* Edward George, finding and fixing an issue in the [e]poll hubs (#74) * Edward George, finding and fixing an issue in the [e]poll hubs (#74)
* Ruijun Luo, figuring out incorrect openssl import for wrap_ssl (#73)

2
eventlet/convenience.py
View File

@@ -119,8 +119,8 @@ try:
wrap_ssl_impl = ssl.wrap_socket wrap_ssl_impl = ssl.wrap_socket
except ImportError: except ImportError:
# < 2.6, trying PyOpenSSL # < 2.6, trying PyOpenSSL
from eventlet.green.OpenSSL import SSL
try: try:
from eventlet.green.OpenSSL import SSL
def wrap_ssl_impl(sock, keyfile=None, certfile=None, server_side=False, def wrap_ssl_impl(sock, keyfile=None, certfile=None, server_side=False,
cert_reqs=None, ssl_version=None, ca_certs=None, cert_reqs=None, ssl_version=None, ca_certs=None,
do_handshake_on_connect=True, do_handshake_on_connect=True,