Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8d2d99aaec
!21 [sync] PR-20: 移除冗余的.swp文件
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-08-18 08:40:56 +00:00
cherry530
8d757f9916 delete .swp file
Signed-off-by: cherry530 <xuping33@huawei.com>
(cherry picked from commit b914927e791e02c5bf0819d5a3315eff453fe419)
2022-08-18 15:49:20 +08:00
openeuler-ci-bot
f1331ee7e6
!19 [sync] PR-16: 解决22.03-LTS安装缺依赖
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-08-18 07:25:56 +00:00
xigaoxinyan
e7af202251 update to 0.33.0
(cherry picked from commit 57635c553cba13bea279151b319b899f41af5d7b)
2022-08-18 15:13:44 +08:00
openeuler-ci-bot
97bf537c1b !15 update to 0.30.2
From: @li-mingzhou
Reviewed-by: @huangtianhua,@shinwell_hu
Signed-off-by: @shinwell_hu
2021-07-31 03:46:24 +00:00
lmz
c44a19e0d1 upgrade to 0.30.2 2021-07-26 20:30:54 +00:00
openeuler-ci-bot
6933ab472a !2 Update latest version of python-eventlet
From: @zhangy1317
Reviewed-by: @shinwell_hu,@myeuler
Signed-off-by: @myeuler
2021-01-17 00:30:57 +08:00
zhangy1317
f3cd49d7f1 update latest version 2021-01-16 09:26:59 +08:00
openeuler-ci-bot
0c83d31fa6 !1 python-eventlet: package init
Merge pull request !1 from yiyurain/yiyurain
2020-03-13 10:51:17 +08:00
yiyurain
7b1f7baa5b python-eventlet: package init 2020-03-13 10:19:21 +08:00
3 changed files with 240 additions and 0 deletions

100
python-eventlet.spec Normal file
View File

@ -0,0 +1,100 @@
%global _empty_manifest_terminate_build 0
Name: python-eventlet
Version: 0.33.0
Release: 2
Summary: Highly concurrent networking library
License: MIT License
URL: http://eventlet.net
Source0: https://github.com/eventlet/eventlet/archive/refs/tags/v0.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.
%package -n python3-eventlet
Summary: Highly concurrent networking library
Provides: python-eventlet
# Base build requires
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr
BuildRequires: python3-pip
BuildRequires: python3-wheel
# General requires
BuildRequires: python3-dns
BuildRequires: python3-greenlet
BuildRequires: python3-six
# General requires
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.33.0 -S git
%build
%py3_build
%install
%py3_install
install -d -m755 %{buildroot}/%{_pkgdocdir}
if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi
if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi
pushd %{buildroot}
if [ -d usr/lib ]; then
find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
fi
if [ -d usr/lib64 ]; then
find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
fi
if [ -d usr/bin ]; then
find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
fi
if [ -d usr/sbin ]; then
find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst
fi
touch doclist.lst
if [ -d usr/share/man ]; then
find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst
fi
popd
mv %{buildroot}/filelist.lst .
mv %{buildroot}/doclist.lst .
%files -n python3-eventlet -f filelist.lst
%dir %{python3_sitelib}/*
%files help -f doclist.lst
%{_docdir}/*
%changelog
* Thu Aug 18 2022 xu_ping <xuping33@h-partners.com> - 0.33.0-2
- remove .python-eventlet.spec.swp file
* Wed Mar 2 2022 xigaoxinyan <xigaoxinyan@huawei.com> - 0.33.0-1
- update to 0.33.0
* Mon Jul 26 2021 OpenStack_SIG <openstack@openeuler.org> - 0.30.2-1
- update to 0.30.2
* Fri Jan 15 2021 Python_Bot <Python_Bot@openeuler.org>
- Package Spec generated
* Thu Mar 12 2020 zoushuangshuang <zoushuangshuang@huawei.com> - 0.23.0-3
- Package init

140
python37.patch Normal file
View File

@ -0,0 +1,140 @@
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'))

BIN
v0.33.0.tar.gz Normal file

Binary file not shown.