openstack/deb-python-eventlet
Code Issues Proposed changes

Fix SSL socket wrapping and Python 2.7.9 compatibility

Browse Source 
This is connected to GH #135 and BitBucket #165
This commit is contained in:
Jakub Stasiak
2014-10-11 01:39:44 +01:00
parent 6cbd4846ab
commit 765d7df36d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eventlet/green/ssl.py
View File

@@ -276,8 +276,11 @@ class GreenSSLSocket(_original_sslsocket):
try: try:
sslwrap = _ssl.sslwrap sslwrap = _ssl.sslwrap
except AttributeError: except AttributeError:
# sslwrap was removed in 2.7.9 # sslwrap was removed in 3.x and later in 2.7.9
self._sslobj = self._context._wrap_socket(self, server_side) if six.PY2:
self._sslobj = self._context._wrap_socket(self._sock, server_side, ssl_sock=self)
else:
self._sslobj = self._context._wrap_socket(self, server_side)
else: else:
self._sslobj = sslwrap(self._sock, server_side, self.keyfile, self.certfile, self._sslobj = sslwrap(self._sock, server_side, self.keyfile, self.certfile,
self.cert_reqs, self.ssl_version, self.cert_reqs, self.ssl_version,