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(-) (limited to 'CHANGES.rst') 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(-) (limited to 'CHANGES.rst') 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(-) (limited to 'CHANGES.rst') 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