From 765d7df36d9e20c1ee094dc9efc88bcfcc5ebbe4 Mon Sep 17 00:00:00 2001 From: Jakub Stasiak Date: Sat, 11 Oct 2014 01:39:44 +0100 Subject: [PATCH] Fix SSL socket wrapping and Python 2.7.9 compatibility This is connected to GH #135 and BitBucket #165 --- eventlet/green/ssl.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py index b76ce38..b028897 100644 --- a/eventlet/green/ssl.py +++ b/eventlet/green/ssl.py @@ -276,8 +276,11 @@ class GreenSSLSocket(_original_sslsocket): try: sslwrap = _ssl.sslwrap except AttributeError: - # sslwrap was removed in 2.7.9 - self._sslobj = self._context._wrap_socket(self, server_side) + # sslwrap was removed in 3.x and later in 2.7.9 + 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: self._sslobj = sslwrap(self._sock, server_side, self.keyfile, self.certfile, self.cert_reqs, self.ssl_version,