From e8678d5e9e64746fe41850f1ca77c32e7c40807d Mon Sep 17 00:00:00 2001 From: Heron Rossi Date: Thu, 8 Mar 2018 10:02:48 -0300 Subject: Adjusting cherrypy WSGI Server import path according to new release --- CONTRIBUTORS.txt | 2 ++ 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: -- cgit v1.2.3 From a3a9d75fbdfcb261740af10096b63fc18b267871 Mon Sep 17 00:00:00 2001 From: Heron Rossi Date: Thu, 8 Mar 2018 11:26:42 -0300 Subject: Fixing formatting and import errors --- pyramid/scripts/pserve.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index afbc4e908..31ab19020 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -347,15 +347,15 @@ def cherrypy_server_runner( from cherrypy.wsgiserver import CherryPyWSGIServer as WSGIServer server = WSGIServer(bind_addr, app, - server_name=server_name, **kwargs) + server_name=server_name, **kwargs) if ssl_pem is not None: if PY2: 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) + from cherrypy.wsgiserver import get_ssl_adapter_class, ssl_builtin + get_ssl_adapter_class() + server.ssl_adapter = ssl_builtin.BuiltinSSLAdapter(ssl_pem, ssl_pem) if protocol_version: server.protocol = protocol_version -- cgit v1.2.3 From 305dc46966a43b1b05e63653849047d6bfa5b55e Mon Sep 17 00:00:00 2001 From: Heron Rossi Date: Thu, 8 Mar 2018 15:15:55 -0300 Subject: Fixing another import path regarding cherrypy version change --- pyramid/scripts/pserve.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 31ab19020..8ee6e1467 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -353,9 +353,14 @@ def cherrypy_server_runner( server.ssl_certificate = server.ssl_private_key = ssl_pem else: # creates wsgiserver.ssl_builtin as side-effect - from cherrypy.wsgiserver import get_ssl_adapter_class, ssl_builtin + try: + from cheroot.server import get_ssl_adapter_class + from cheroot.ssl.builtin import BuiltinSSLAdapter + except ImportError: + from cherrypy.wsgiserver import get_ssl_adapter_class + from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter get_ssl_adapter_class() - server.ssl_adapter = ssl_builtin.BuiltinSSLAdapter(ssl_pem, ssl_pem) + server.ssl_adapter = BuiltinSSLAdapter(ssl_pem, ssl_pem) if protocol_version: server.protocol = protocol_version -- cgit v1.2.3 From ea79cbae09cf30f8fba0ba17ee53925299ff8371 Mon Sep 17 00:00:00 2001 From: Heron Rossi Date: Fri, 9 Mar 2018 09:23:43 -0300 Subject: Adding entry on CHANGES.txt --- CHANGES.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 482610319..592315827 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,10 @@ Features instead of ``pyramid.util.Request``. See https://github.com/Pylons/pyramid/pull/3129 +- Added a fallback ``try/except`` block on ``pyramid/scripts/pserve.cherrypy_server_runner`` + due to module/import changes on CherryPy 9+ + See https://github.com/Pylons/pyramid/pull/3235 + Bug Fixes --------- @@ -35,6 +39,9 @@ Backward Incompatibilities depending on it directly within your project. See https://github.com/Pylons/pyramid/pull/3140 +- On CherryPy 9+ all functionality from ``cherrypy.wsgiserver`` was moved to ``cheroot``. + See https://github.com/Pylons/pyramid/issues/3195 + Documentation Changes --------------------- -- cgit v1.2.3 From 13cc78aac19280671f07d24cd62f8ae6b4e86c9e Mon Sep 17 00:00:00 2001 From: Heron Rossi Date: Fri, 9 Mar 2018 13:31:30 -0300 Subject: Rephrasing feature change --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 592315827..d881430f5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -21,8 +21,8 @@ Features instead of ``pyramid.util.Request``. See https://github.com/Pylons/pyramid/pull/3129 -- Added a fallback ``try/except`` block on ``pyramid/scripts/pserve.cherrypy_server_runner`` - due to module/import changes on CherryPy 9+ +- In ``cherrypy_server_runner``, prefer imports from the ``cheroot` package over the legacy + imports from `cherrypy.wsgiserver`. See https://github.com/Pylons/pyramid/pull/3235 Bug Fixes -- cgit v1.2.3 From 6484dbf642b6cfe33de65d7734015d9d4799fb48 Mon Sep 17 00:00:00 2001 From: Heron Rossi Date: Fri, 9 Mar 2018 13:52:58 -0300 Subject: Fix invalid string in feature rephrasing --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index d881430f5..eb5b477fa 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -21,7 +21,7 @@ Features instead of ``pyramid.util.Request``. See https://github.com/Pylons/pyramid/pull/3129 -- In ``cherrypy_server_runner``, prefer imports from the ``cheroot` package over the legacy +- In ``cherrypy_server_runner``, prefer imports from the ``cheroot`` package over the legacy imports from `cherrypy.wsgiserver`. See https://github.com/Pylons/pyramid/pull/3235 -- cgit v1.2.3 From 7cf1a5d2ba1f963ba84b0d8196322476b0fe5ec8 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 9 Mar 2018 12:24:56 -0500 Subject: Not a backward-incompatibility for Pyramid. [ci skip] --- CHANGES.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index eb5b477fa..7a8fa31f2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -39,9 +39,6 @@ Backward Incompatibilities depending on it directly within your project. See https://github.com/Pylons/pyramid/pull/3140 -- On CherryPy 9+ all functionality from ``cherrypy.wsgiserver`` was moved to ``cheroot``. - See https://github.com/Pylons/pyramid/issues/3195 - Documentation Changes --------------------- -- cgit v1.2.3