diff options
author | Marcel Hellkamp <marc@gsites.de> | 2016-07-11 12:45:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-11 12:45:02 +0200 |
commit | 6826ece5cf35b813ab441541234dd14243e12d9c (patch) | |
tree | 732d32c6a7f681fdf8d7a6ded63a24546e9362d4 | |
parent | d573675243ace953730b0255600533c1347c4f31 (diff) | |
parent | cafc15419cbb4a6cb748e6ecdccf92893bb25ce5 (diff) | |
download | bottle-6826ece5cf35b813ab441541234dd14243e12d9c.tar.gz |
Merge pull request #864 from eshizhan/patch-2
remove deprecated logic from GeventServer
-rw-r--r-- | bottle.py | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -3204,21 +3204,18 @@ class DieselServer(ServerAdapter): class GeventServer(ServerAdapter): """ Untested. Options: - * `fast` (default: False) uses libevent's http server, but has some - issues: No streaming, no pipelining, no SSL. * 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 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()) |