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 <zhangliangpengkun@xfusion.com>
This commit is contained in:
zhang-liang-pengkun 2024-01-23 16:08:00 +08:00
parent 06b639717a
commit f4c1e33c4d
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From a3ba0eb30e7becdfe0eb83dc2babaa40847cd7d0 Mon Sep 17 00:00:00 2001
From: Marcel Hellkamp <marc@gsites.de>
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 <juergh@protonmail.com>
---
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

View File

@ -1,6 +1,6 @@
Name: python-bottle
Version: 0.12.13
Release: 19
Release: 20
Summary: WSGI micro web-framework for Python.
License: MIT
URL: http://bottlepy.org
@ -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: python2-devel python2-setuptools python3-devel python3-setuptools
@ -72,6 +73,9 @@ sed -i '/^#!/d' bottle.py
%{python3_sitelib}/*
%changelog
* Tue Jan 23 2024 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 0.12.13-20
- 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<zhangliangpengkun@xfusion.com> - 0.12.13-19
- Add ServerAdapter for CherryPy >= 9