158f33f315
Signed-off-by: zhang-liang-pengkun <zhangliangpengkun@xfusion.com> (cherry picked from commit 440be8ab765ab43a51cde79b625856878f580bea)
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 19a12f898b7343e16f0d08821de6aac169143752 Mon Sep 17 00:00:00 2001
|
|
From: Marcel Hellkamp <marc@gsites.de>
|
|
Date: Tue, 27 Nov 2018 19:27:54 +0100
|
|
Subject: [PATCH] fix #1065 gevent-1.3.0 removes 'fast' wsgi implementation.
|
|
|
|
---
|
|
bottle.py | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/bottle.py b/bottle.py
|
|
index 3a51b38..cb46893 100644
|
|
--- a/bottle.py
|
|
+++ b/bottle.py
|
|
@@ -2904,14 +2904,16 @@ class GeventServer(ServerAdapter):
|
|
* See gevent.wsgi.WSGIServer() documentation for more options.
|
|
"""
|
|
def run(self, handler):
|
|
- from gevent import wsgi, pywsgi, local
|
|
+ from gevent import pywsgi, local
|
|
if not isinstance(threading.local(), local.local):
|
|
msg = "Bottle requires gevent.monkey.patch_all() (before import)"
|
|
raise RuntimeError(msg)
|
|
- if not self.options.pop('fast', None): wsgi = pywsgi
|
|
- self.options['log'] = None if self.quiet else 'default'
|
|
+ if self.options.pop('fast', None):
|
|
+ depr('The "fast" option has been deprecated and removed by Gevent.')
|
|
+ if self.quiet:
|
|
+ self.options['log'] = None
|
|
address = (self.host, self.port)
|
|
- server = wsgi.WSGIServer(address, handler, **self.options)
|
|
+ server = pywsgi.WSGIServer(address, handler, **self.options)
|
|
if 'BOTTLE_CHILD' in os.environ:
|
|
import signal
|
|
signal.signal(signal.SIGINT, lambda s, f: server.stop())
|
|
--
|
|
2.39.0.windows.2
|
|
|