Accepting request 1090162 from devel:languages:python

- handle-python-ssl-changes.patch: refresh to handle ssl.shared_ciphers()
  behavior change in python 3.11 as well

OBS-URL: https://build.opensuse.org/request/show/1090162
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-gevent?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger 2023-06-03 22:12:19 +00:00 committed by Git OBS Bridge
commit 195641487b
3 changed files with 25 additions and 11 deletions

View File

@ -2,25 +2,35 @@ Index: gevent-22.10.2/src/greentest/3.10/test_ssl.py
===================================================================
--- gevent-22.10.2.orig/src/greentest/3.10/test_ssl.py
+++ gevent-22.10.2/src/greentest/3.10/test_ssl.py
@@ -2306,13 +2306,19 @@ class SimpleBackgroundTests(unittest.Tes
@@ -2306,13 +2306,11 @@ class SimpleBackgroundTests(unittest.Tes
self.assertIs(sslobj._sslobj.owner, sslobj)
self.assertIsNone(sslobj.cipher())
self.assertIsNone(sslobj.version())
- self.assertIsNotNone(sslobj.shared_ciphers())
self.assertRaises(ValueError, sslobj.getpeercert)
if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES:
self.assertIsNone(sslobj.get_channel_binding('tls-unique'))
self.ssl_io_loop(sock, incoming, outgoing, sslobj.do_handshake)
self.assertTrue(sslobj.cipher())
- self.assertIsNotNone(sslobj.shared_ciphers())
self.assertIsNotNone(sslobj.version())
self.assertTrue(sslobj.getpeercert())
if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES:
Index: gevent-22.10.2/src/greentest/3.11/test_ssl.py
===================================================================
--- gevent-22.10.2.orig/src/greentest/3.11/test_ssl.py
+++ gevent-22.10.2/src/greentest/3.11/test_ssl.py
@@ -2326,13 +2326,11 @@ class SimpleBackgroundTests(unittest.Tes
self.assertIs(sslobj._sslobj.owner, sslobj)
self.assertIsNone(sslobj.cipher())
self.assertIsNone(sslobj.version())
- self.assertIsNotNone(sslobj.shared_ciphers())
+ try:
+ self.assertIsNotNone(sslobj.shared_ciphers())
+ except AssertionError:
+ self.assertIsNone(sslobj.shared_ciphers())
self.assertRaises(ValueError, sslobj.getpeercert)
if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES:
self.assertIsNone(sslobj.get_channel_binding('tls-unique'))
self.ssl_io_loop(sock, incoming, outgoing, sslobj.do_handshake)
self.assertTrue(sslobj.cipher())
- self.assertIsNotNone(sslobj.shared_ciphers())
+ try:
+ self.assertIsNotNone(sslobj.shared_ciphers())
+ except AssertionError:
+ self.assertIsNone(sslobj.shared_ciphers())
self.assertIsNotNone(sslobj.version())
self.assertTrue(sslobj.getpeercert())
if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES:

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 1 07:05:01 UTC 2023 - Dirk Müller <dmueller@suse.com>
- handle-python-ssl-changes.patch: refresh to handle ssl.shared_ciphers()
behavior change in python 3.11 as well
-------------------------------------------------------------------
Mon May 15 14:18:03 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>

View File

@ -112,9 +112,7 @@ Documentation and examples for %{name}.
%if 0%{?sle_version} <= 150300
%patch1 -p1
%endif
%if 0%{?is_opensuse}
%patch2 -p1
%endif
sed -i -e '1s!bin/env python!bin/python!' examples/*.py
sed -i -e '1{/bin.*python/d}' src/gevent/tests/*.py