From 9476698f04e893988816ff74005f70a9bb3f2732 Mon Sep 17 00:00:00 2001 From: zhang-liang-pengkun Date: Tue, 23 Jan 2024 16:11:31 +0800 Subject: [PATCH] Added 'cheroot' server adapter to list of server names, so it can be selected from the command line and by name . Signed-off-by: zhang-liang-pengkun --- ...rver-adapter-to-list-of-server-names.patch | 41 +++++++++++++++++++ python-bottle.spec | 6 ++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0011-Added-cheroot-server-adapter-to-list-of-server-names.patch diff --git a/0011-Added-cheroot-server-adapter-to-list-of-server-names.patch b/0011-Added-cheroot-server-adapter-to-list-of-server-names.patch new file mode 100644 index 0000000..176035a --- /dev/null +++ b/0011-Added-cheroot-server-adapter-to-list-of-server-names.patch @@ -0,0 +1,41 @@ +From a3ba0eb30e7becdfe0eb83dc2babaa40847cd7d0 Mon Sep 17 00:00:00 2001 +From: Marcel Hellkamp +Date: Sat, 25 Mar 2017 17:59:26 +0100 +Subject: [PATCH] Added 'cheroot' server adapter to list of server names, so it + can be selected from the command line and by name. + +Alos added cheroot after cherrypy in the 'auto' adapter to make it future proof. + +(backported from commit 617d08a2ccca95b2e8668fef7057127049595fd9) +[juergh: Adjust context.] +Signed-off-by: Juerg Haefliger +--- + bottle.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/bottle.py b/bottle.py +index 73886a2..11121b8 100644 +--- a/bottle.py ++++ b/bottle.py +@@ -3002,7 +3002,9 @@ class BjoernServer(ServerAdapter): + + class AutoServer(ServerAdapter): + """ Untested. """ +- adapters = [WaitressServer, PasteServer, TwistedServer, CherryPyServer, WSGIRefServer] ++ adapters = [WaitressServer, PasteServer, TwistedServer, CherryPyServer, ++ CherootServer, WSGIRefServer] ++ + def run(self, handler): + for sa in self.adapters: + try: +@@ -3016,6 +3018,7 @@ server_names = { + 'wsgiref': WSGIRefServer, + 'waitress': WaitressServer, + 'cherrypy': CherryPyServer, ++ 'cheroot': CherootServer, + 'paste': PasteServer, + 'fapws3': FapwsServer, + 'tornado': TornadoServer, +-- +2.39.0.windows.2 + diff --git a/python-bottle.spec b/python-bottle.spec index 6f3414f..d22d8ad 100644 --- a/python-bottle.spec +++ b/python-bottle.spec @@ -1,6 +1,6 @@ Name: python-bottle Version: 0.12.13 -Release: 20 +Release: 21 Summary: WSGI micro web-framework for Python. License: MIT URL: https://github.com/bottlepy/bottle @@ -18,6 +18,7 @@ Patch0008: 0007-Fix-the-Allow-header-value-in-405-Method-not-allowed.patch Patch0009: 0008-Fix-Multipart-file-uploads-with-empty-filename-not-d.patch Patch0010: 0009-Fix-for-Issue-586.patch Patch0011: 0010-Add-ServerAdapter-for-CherryPy-9.patch +Patch0012: 0011-Added-cheroot-server-adapter-to-list-of-server-names.patch BuildArch: noarch BuildRequires: python3-devel python3-setuptools @@ -55,6 +56,9 @@ sed -i '/^#!/d' bottle.py %exclude %{_bindir}/bottle.py %changelog +* Tue Jan 23 2024 zhangliangpengkun - 0.12.13-21 +- Added 'cheroot' server adapter to list of server names, so it can be selected from the command line and by name. + * Thu Jan 18 2024 zhangliangpengkun - 0.12.13-20 - Add ServerAdapter for CherryPy >= 9 -- Gitee