Skip to content

Commit 6e9c55a

Browse files
defnulljuergh
authored andcommitted
Added depr warning for the outdated cherrypy server adapter.
If you are using this adapter, simply switch to 'cheroot' This should fix some recent and some very old issues regarding cherrypy: fix #947 Leave explicit the maxima version supported the CherryPy (<= 9.0.0) fix #932 Add ServerAdapter (fix CherryPy ServerAdapter) fix #685 Update CherryPy SSL to use latest API and work on Py3 fix #574 Allow custom bind_addr for CherryPy (backported from commit be90814) [juergh: Adjust context, drop modifications of test/travis-requirements.txt which does not exist in 0.12.] Signed-off-by: Juerg Haefliger <[email protected]>
1 parent a3ba0eb commit 6e9c55a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

bottle.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2793,7 +2793,11 @@ class server_cls(server_cls):
27932793

27942794
class CherryPyServer(ServerAdapter):
27952795
def run(self, handler): # pragma: no cover
2796-
from cherrypy import wsgiserver
2796+
depr(0, 13, "The wsgi server part of cherrypy was split into a new "
2797+
"project called 'cheroot'.", "Use the 'cheroot' server "
2798+
"adapter instead of cherrypy.")
2799+
from cherrypy import wsgiserver # This will fail for CherryPy >= 9
2800+
27972801
self.options['bind_addr'] = (self.host, self.port)
27982802
self.options['wsgi_app'] = handler
27992803

0 commit comments

Comments
 (0)