summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2018-11-27 19:27:54 +0100
committerMarcel Hellkamp <marc@gsites.de>2018-11-27 19:27:54 +0100
commit19a12f898b7343e16f0d08821de6aac169143752 (patch)
tree8d3d4a062b70f6787616a80f6b1d52bb8a1846dd
parent7423aa0f64e381507d1e06a6bcab48888baf9a7b (diff)
downloadbottle-19a12f898b7343e16f0d08821de6aac169143752.tar.gz
fix #1065 gevent-1.3.0 removes 'fast' wsgi implementation.
-rw-r--r--bottle.py10
1 files 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())