summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2017-03-25 17:59:26 +0100
committerJuerg Haefliger <juergh@protonmail.com>2022-05-24 08:57:52 +0200
commita3ba0eb30e7becdfe0eb83dc2babaa40847cd7d0 (patch)
tree5bfaa4bd52fa9a597643cd3c9357116231ea29e6
parent888aa8e7b8f6490015463ee370ff4026fc951b1f (diff)
downloadbottle-a3ba0eb30e7becdfe0eb83dc2babaa40847cd7d0.tar.gz
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>
-rw-r--r--bottle.py5
1 files changed, 4 insertions, 1 deletions
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,