!17 Upgrade to 0.33.0

From: @huangtianhua 
Reviewed-by: @xiyuanwang, @shinwell_hu 
Signed-off-by: @xiyuanwang, @shinwell_hu

python-eventlet.spec

@@ -1,13 +1,12 @@
 %global _empty_manifest_terminate_build 0
 Name:           python-eventlet
-Version:        0.30.2
+Version:        0.33.0
 Release:        1
 Summary:        Highly concurrent networking library
-License:        MIT License
+License:        MIT
 URL:            http://eventlet.net
-Source0:        https://files.pythonhosted.org/packages/23/db/8ff5a9dec5ff016d5836254b676d507c2180d8838d7e545277d938896913/eventlet-0.30.2.tar.gz
+Source0:        https://files.pythonhosted.org/packages/12/c9/898ab514f82fb8f9a5a37a36c44a798c023fc42d6de863ad940861222ad4/eventlet-0.33.0.tar.gz
 BuildArch:      noarch
-
 %description
 Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it.
 
@@ -28,19 +27,17 @@ BuildRequires:  python3-six
 Requires:       python3-dns
 Requires:       python3-greenlet
 Requires:       python3-six
-
 %description -n python3-eventlet
 Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it.
 
 %package help
 Summary:        Highly concurrent networking library
 Provides:       python3-eventlet-doc
-
 %description help
 Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it.
 
 %prep
-%autosetup -n eventlet-0.30.2 -S git
+%autosetup -n eventlet-%{version}
 
 %build
 %py3_build
@@ -76,13 +73,15 @@ mv %{buildroot}/doclist.lst .
 
 
 %files -n python3-eventlet -f filelist.lst
-
 %dir %{python3_sitelib}/*
 
 %files help -f doclist.lst
 %{_docdir}/*
 
 %changelog
+* Wed May 18 2022 OpenStack_SIG <openstack@openeuler.org> - 0.33.0-1
+- Upgrade package python3-eventlet to version 0.33.0
+
 * Mon Jul 26 2021 OpenStack_SIG <openstack@openeuler.org> - 0.30.2-1
 - update to 0.30.2
 

python37.patch

@@ -1,140 +0,0 @@
-From 0d4e7bcb90800d6700b2c81c41c9770ee5f94358 Mon Sep 17 00:00:00 2001
-From: Marcel Plch <mplch@redhat.com>
-Date: Mon, 9 Jul 2018 16:45:45 +0200
-Subject: [PATCH] Fix for Python 3.7
-
----
- eventlet/green/ssl.py | 46 ++++++++++++++++++++++++++++++++++++++++------
- tests/debug_test.py   | 14 ++++++++++++--
- tests/hub_test.py     |  4 +++-
- 3 files changed, 55 insertions(+), 9 deletions(-)
-
-diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py
-index 53ee9a3c..df72869e 100644
---- a/eventlet/green/ssl.py
-+++ b/eventlet/green/ssl.py
-@@ -24,6 +24,7 @@
-     'create_default_context', '_create_default_https_context']
- 
- _original_sslsocket = __ssl.SSLSocket
-+_original_wrap_socket = __ssl.wrap_socket
- 
- 
- class GreenSSLSocket(_original_sslsocket):
-@@ -57,11 +58,41 @@ def __init__(self, sock, keyfile=None, certfile=None,
-             # 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=do_handshake_on_connect and six.PY2,
-+                    *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 @@ def connect(self, addr):
-         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()
-diff --git a/tests/debug_test.py b/tests/debug_test.py
-index 8299dede..82b3a834 100644
---- a/tests/debug_test.py
-+++ b/tests/debug_test.py
-@@ -29,6 +29,11 @@ def test_unspew(self):
-         assert self.tracer is None
- 
-     def test_line(self):
-+        if sys.version_info >= (3, 7):
-+            frame_str = "f=<frame at"
-+        else:
-+            frame_str = "f=<frame object at"
-+
-         sys.stdout = six.StringIO()
-         s = debug.Spew()
-         f = sys._getframe()
-@@ -36,7 +41,7 @@ def test_line(self):
-         lineno = f.f_lineno - 1  # -1 here since we called with frame f in the line above
-         output = sys.stdout.getvalue()
-         assert "%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output)
--        assert "f=<frame object at" in output
-+        assert frame_str in output
- 
-     def test_line_nofile(self):
-         sys.stdout = six.StringIO()
-@@ -51,6 +56,11 @@ def test_line_nofile(self):
-         assert "VM instruction #" in output, output
- 
-     def test_line_global(self):
-+        if sys.version_info >= (3, 7):
-+            frame_str = "f=<frame at"
-+        else:
-+            frame_str = "f=<frame object at"
-+
-         global GLOBAL_VAR
-         sys.stdout = six.StringIO()
-         GLOBAL_VAR = debug.Spew()
-@@ -59,7 +69,7 @@ def test_line_global(self):
-         lineno = f.f_lineno - 1  # -1 here since we called with frame f in the line above
-         output = sys.stdout.getvalue()
-         assert "%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output)
--        assert "f=<frame object at" in output
-+        assert frame_str in output
-         assert "GLOBAL_VAR" in f.f_globals
-         assert "GLOBAL_VAR=<eventlet.debug.Spew object at" in output
-         del GLOBAL_VAR
-diff --git a/tests/hub_test.py b/tests/hub_test.py
-index 61b5b0b9..024f7a52 100644
---- a/tests/hub_test.py
-+++ b/tests/hub_test.py
-@@ -400,4 +400,6 @@ def fail_import(name, *args, **kwargs):
- '''
-         self.write_to_tempfile('newmod', module_source)
-         output, _ = self.launch_subprocess('newmod.py')
--        self.assertEqual(output, 'kqueue tried\nok\n')
-+        # Should be equal, but this will do until
-+        # the imp deprecation warning is fixed.
-+        self.assertTrue(output.endswith('kqueue tried\nok\n'))