diff options
| author | Heron Rossi <heron.rossi@hotmail.com> | 2018-03-08 10:02:48 -0300 |
|---|---|---|
| committer | Heron Rossi <heron.rossi@hotmail.com> | 2018-03-08 10:02:48 -0300 |
| commit | e8678d5e9e64746fe41850f1ca77c32e7c40807d (patch) | |
| tree | 354807e1e7b433d13284f076224e33667292d83d | |
| parent | 681a79f56cae6c21103f75c7062679ed8b449322 (diff) | |
| download | pyramid-e8678d5e9e64746fe41850f1ca77c32e7c40807d.tar.gz pyramid-e8678d5e9e64746fe41850f1ca77c32e7c40807d.tar.bz2 pyramid-e8678d5e9e64746fe41850f1ca77c32e7c40807d.zip | |
Adjusting cherrypy WSGI Server import path according to new release
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 83469c14c..b6dbcff2c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -314,3 +314,5 @@ Contributors - Lars Blumberg, 2017/08/14 - Deneys Maartens, 2017/11/03 + +- Heron Rossi, 2018/03/08 diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index f7d094980..afbc4e908 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -341,9 +341,12 @@ def cherrypy_server_runner( if var is not None: kwargs[var_name] = int(var) - from cherrypy import wsgiserver + try: + from cheroot.wsgi import Server as WSGIServer + except ImportError: + from cherrypy.wsgiserver import CherryPyWSGIServer as WSGIServer - server = wsgiserver.CherryPyWSGIServer(bind_addr, app, + server = WSGIServer(bind_addr, app, server_name=server_name, **kwargs) if ssl_pem is not None: if PY2: |