forked from pool/python-eventlet
82c5a213c9
- add 0002-Fix-for-Python-3.7-506.patch and add 0003-Fix-compatibility-with-Python-3.7-ssl.SSLSocket-531.patch Both needed for python 3.7 compatibility OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-eventlet?expand=0&rev=58
97 lines
3.4 KiB
Diff
97 lines
3.4 KiB
Diff
From cf47cb518db3e0dbdd48473fb40cf9f6ecd50e07 Mon Sep 17 00:00:00 2001
|
|
From: Marcel Plch <mplch@redhat.com>
|
|
Date: Fri, 28 Sep 2018 17:08:59 +0200
|
|
Subject: [PATCH 2/3] Fix for Python 3.7 (#506)
|
|
|
|
* Fix for Python 3.7
|
|
|
|
* Remove redundant piece of code.
|
|
|
|
* Put back do_handshake_on_connect kwarg
|
|
|
|
* Use Python 3.7 instead of 3.7-dev
|
|
|
|
* Fix buildbot failing permissions with 3.7
|
|
|
|
* tests: env_tpool_zero assert details
|
|
|
|
* setup: Python 3.7 classificator
|
|
---
|
|
eventlet/green/ssl.py | 46 +++++++++++++++++++++++++++++++++++++------
|
|
1 file changed, 40 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py
|
|
index 577afba..53dff70 100644
|
|
--- a/eventlet/green/ssl.py
|
|
+++ b/eventlet/green/ssl.py
|
|
@@ -23,6 +23,7 @@ __patched__ = [
|
|
'create_default_context', '_create_default_https_context']
|
|
|
|
_original_sslsocket = __ssl.SSLSocket
|
|
+_original_wrap_socket = __ssl.wrap_socket
|
|
|
|
|
|
class GreenSSLSocket(_original_sslsocket):
|
|
@@ -56,11 +57,41 @@ class GreenSSLSocket(_original_sslsocket):
|
|
# this assignment
|
|
self._timeout = sock.gettimeout()
|
|
|
|
- # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled
|
|
- # even when it's on
|
|
- super(GreenSSLSocket, self).__init__(
|
|
- sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version,
|
|
- ca_certs, do_handshake_on_connect and six.PY2, *args, **kw)
|
|
+ if sys.version_info >= (3, 7):
|
|
+ # Monkey-patch the sslsocket so our modified self gets
|
|
+ # injected into its _create method.
|
|
+ def fake_new(self, cls, *args, **kwargs):
|
|
+ return self
|
|
+
|
|
+ orig_new = _original_sslsocket.__new__
|
|
+ try:
|
|
+ _original_sslsocket.__new__ = fake_new.__get__(self, GreenSSLSocket)
|
|
+
|
|
+ self = _original_wrap_socket(
|
|
+ sock=sock.fd,
|
|
+ keyfile=keyfile,
|
|
+ certfile=certfile,
|
|
+ server_side=server_side,
|
|
+ cert_reqs=cert_reqs,
|
|
+ ssl_version=ssl_version,
|
|
+ ca_certs=ca_certs,
|
|
+ do_handshake_on_connect=False,
|
|
+ *args, **kw
|
|
+ )
|
|
+ self.keyfile = keyfile
|
|
+ self.certfile = certfile
|
|
+ self.cert_reqs = cert_reqs
|
|
+ self.ssl_version = ssl_version
|
|
+ self.ca_certs = ca_certs
|
|
+ finally:
|
|
+ # Unpatch
|
|
+ _original_sslsocket.__new__ = orig_new
|
|
+ else:
|
|
+ # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled
|
|
+ # even when it's on
|
|
+ super(GreenSSLSocket, self).__init__(
|
|
+ sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version,
|
|
+ ca_certs, do_handshake_on_connect and six.PY2, *args, **kw)
|
|
|
|
# the superclass initializer trashes the methods so we remove
|
|
# the local-object versions of them and let the actual class
|
|
@@ -323,7 +354,10 @@ class GreenSSLSocket(_original_sslsocket):
|
|
except NameError:
|
|
self._sslobj = sslobj
|
|
else:
|
|
- self._sslobj = SSLObject(sslobj, owner=self)
|
|
+ if sys.version_info < (3, 7):
|
|
+ self._sslobj = SSLObject(sslobj, owner=self)
|
|
+ else:
|
|
+ self._sslobj = sslobj
|
|
|
|
if self.do_handshake_on_connect:
|
|
self.do_handshake()
|
|
--
|
|
2.21.0
|
|
|