Sync from SUSE:SLFO:Main python-cheroot revision dce5a0fc4244315d18ec2fae6aeef18e

This commit is contained in:
Adrian Schröter 2024-10-03 17:54:17 +02:00
parent c98826ea99
commit a2d48c4e0a
6 changed files with 40 additions and 29 deletions

BIN
cheroot-10.0.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
cheroot-10.0.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,7 +1,7 @@
Index: cheroot-9.0.0/cheroot/test/conftest.py
Index: cheroot-10.0.1/cheroot/test/conftest.py
===================================================================
--- cheroot-9.0.0.orig/cheroot/test/conftest.py
+++ cheroot-9.0.0/cheroot/test/conftest.py
--- cheroot-10.0.1.orig/cheroot/test/conftest.py
+++ cheroot-10.0.1/cheroot/test/conftest.py
@@ -9,7 +9,7 @@ import time
import pytest
@ -10,8 +10,8 @@ Index: cheroot-9.0.0/cheroot/test/conftest.py
+from cheroot._compat import IS_MACOS, IS_WINDOWS, PLATFORM_ARCH # noqa: WPS436
from cheroot.server import Gateway, HTTPServer
from cheroot.testing import ( # noqa: F401 # pylint: disable=unused-import
native_server, wsgi_server,
@@ -28,6 +28,9 @@ def http_request_timeout():
native_server,
@@ -31,6 +31,9 @@ def http_request_timeout():
if IS_WINDOWS:
computed_timeout *= 10

View File

@ -5,32 +5,30 @@
cheroot/test/test_ssl.py | 12 ++++++------
4 files changed, 18 insertions(+), 18 deletions(-)
Index: cheroot-10.0.0/cheroot/ssl/builtin.py
Index: cheroot-10.0.1/cheroot/ssl/builtin.py
===================================================================
--- cheroot-10.0.0.orig/cheroot/ssl/builtin.py
+++ cheroot-10.0.0/cheroot/ssl/builtin.py
@@ -25,11 +25,11 @@ except ImportError:
--- cheroot-10.0.1.orig/cheroot/ssl/builtin.py
+++ cheroot-10.0.1/cheroot/ssl/builtin.py
@@ -25,10 +25,10 @@ except ImportError:
except ImportError:
DEFAULT_BUFFER_SIZE = -1
-from . import Adapter
-from .. import errors
-from .._compat import IS_ABOVE_OPENSSL10
-from ..makefile import StreamReader, StreamWriter
-from ..server import HTTPServer
+from cheroot.ssl import Adapter
+from cheroot import errors
+from cheroot._compat import IS_ABOVE_OPENSSL10
+from cheroot.makefile import StreamReader, StreamWriter
+from cheroot.server import HTTPServer
generic_socket_error = OSError
Index: cheroot-10.0.0/cheroot/test/conftest.py
def _assert_ssl_exc_contains(exc, *msgs):
Index: cheroot-10.0.1/cheroot/test/conftest.py
===================================================================
--- cheroot-10.0.0.orig/cheroot/test/conftest.py
+++ cheroot-10.0.0/cheroot/test/conftest.py
@@ -9,12 +9,12 @@ import time
--- cheroot-10.0.1.orig/cheroot/test/conftest.py
+++ cheroot-10.0.1/cheroot/test/conftest.py
@@ -9,15 +9,15 @@ import time
import pytest
@ -40,17 +38,20 @@ Index: cheroot-10.0.0/cheroot/test/conftest.py
+from cheroot._compat import IS_MACOS, IS_WINDOWS # noqa: WPS436
+from cheroot.server import Gateway, HTTPServer
+from cheroot.testing import ( # noqa: F401 # pylint: disable=unused-import
native_server, wsgi_server,
native_server,
thread_and_wsgi_server,
thread_and_native_server,
wsgi_server,
)
-from ..testing import get_server_client
+from cheroot.testing import get_server_client
@pytest.fixture
Index: cheroot-10.0.0/cheroot/test/test_server.py
Index: cheroot-10.0.1/cheroot/test/test_server.py
===================================================================
--- cheroot-10.0.0.orig/cheroot/test/test_server.py
+++ cheroot-10.0.0/cheroot/test/test_server.py
--- cheroot-10.0.1.orig/cheroot/test/test_server.py
+++ cheroot-10.0.1/cheroot/test/test_server.py
@@ -13,11 +13,11 @@ import pytest
import requests
import requests_unixsocket
@ -68,10 +69,10 @@ Index: cheroot-10.0.0/cheroot/test/test_server.py
ANY_INTERFACE_IPV4,
ANY_INTERFACE_IPV6,
EPHEMERAL_PORT,
Index: cheroot-10.0.0/cheroot/test/test_ssl.py
Index: cheroot-10.0.1/cheroot/test/test_ssl.py
===================================================================
--- cheroot-10.0.0.orig/cheroot/test/test_ssl.py
+++ cheroot-10.0.0/cheroot/test/test_ssl.py
--- cheroot-10.0.1.orig/cheroot/test/test_ssl.py
+++ cheroot-10.0.1/cheroot/test/test_ssl.py
@@ -16,11 +16,11 @@ import pytest
import requests
import trustme

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed May 22 13:36:38 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Update to 10.0.1
* Fixed a flaw where internally unhandled exceptions could crash the
worker threads and eventually starve the server of its processing
resources.
* Fixed compatibility with Python 3.8 in the built-in TLS adapter that
relies on :pypython:ssl.
-------------------------------------------------------------------
Wed Jan 10 17:40:08 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>

View File

@ -1,5 +1,5 @@
#
# spec file
# spec file for package python-cheroot
#
# Copyright (c) 2024 SUSE LLC
#
@ -26,7 +26,7 @@
%bcond_with ringdisabled
%{?sle15_python_module_pythons}
Name: python-%{pypi_name}
Version: 10.0.0
Version: 10.0.1
Release: 0
Summary: Pure-python HTTP server
License: BSD-3-Clause
@ -76,7 +76,7 @@ Requires: alts
BuildRequires: alts
%else
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
%endif
# the package and distribution name is lowercase-cheroot,
# but PyPI claims the name is capital-Cheroot