diff options
Diffstat (limited to 'pyramid/scripts/pserve.py')
| -rw-r--r-- | pyramid/scripts/pserve.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index cc368d721..8cceecbb3 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -25,6 +25,7 @@ import traceback from paste.deploy import loadserver from paste.deploy import loadapp +from pyramid.compat import PY3 from pyramid.compat import WIN from pyramid.paster import setup_logging @@ -959,7 +960,15 @@ def cherrypy_server_runner( server = wsgiserver.CherryPyWSGIServer(bind_addr, app, server_name=server_name, **kwargs) - server.ssl_certificate = server.ssl_private_key = ssl_pem + if ssl_pem is not None: + if not PY3: + server.ssl_certificate = server.ssl_private_key = ssl_pem + else: + # creates wsgiserver.ssl_builtin as side-effect + wsgiserver.get_ssl_adapter_class() + server.ssl_adapter = wsgiserver.ssl_builtin.BuiltinSSLAdapter( + ssl_pem, ssl_pem) + if protocol_version: server.protocol = protocol_version |