Skip to content

Commit

Permalink
Added depr warning for the outdated cherrypy server adapter.
Browse files Browse the repository at this point in the history
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 <juergh@protonmail.com>
  • Loading branch information
defnull authored and juergh committed May 24, 2022
1 parent a3ba0eb commit 6e9c55a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion bottle.py
Original file line number Diff line number Diff line change
Expand Up @@ -2793,7 +2793,11 @@ class server_cls(server_cls):

class CherryPyServer(ServerAdapter):
def run(self, handler): # pragma: no cover
from cherrypy import wsgiserver
depr(0, 13, "The wsgi server part of cherrypy was split into a new "
"project called 'cheroot'.", "Use the 'cheroot' server "
"adapter instead of cherrypy.")
from cherrypy import wsgiserver # This will fail for CherryPy >= 9

self.options['bind_addr'] = (self.host, self.port)
self.options['wsgi_app'] = handler

Expand Down

0 comments on commit 6e9c55a

Please sign in to comment.