diff options
| author | Jakub Stasiak <jakub@stasiak.at> | 2014-10-11 01:39:44 +0100 |
|---|---|---|
| committer | Jakub Stasiak <jakub@stasiak.at> | 2014-10-11 01:41:30 +0100 |
| commit | 765d7df36d9e20c1ee094dc9efc88bcfcc5ebbe4 (patch) | |
| tree | 737fecfbd8e353d21ab38d249fd1b1135d4119b4 | |
| parent | 6cbd4846ab2f12b1c18c38b570293c0bb05d28a7 (diff) | |
| download | eventlet-765d7df36d9e20c1ee094dc9efc88bcfcc5ebbe4.tar.gz | |
Fix SSL socket wrapping and Python 2.7.9 compatibility
This is connected to GH #135 and BitBucket #165
| -rw-r--r-- | eventlet/green/ssl.py | 7 |
1 files 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, |