Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wsgiserver import error for cherrypy server #1346

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wsgiserver import error for cherrypy server #1346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion bottle.py
View file
Open in desktop
Expand Up @@ -3292,7 +3292,10 @@ def run(self, handler): # pragma: no cover
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
try:
from cherrypy import wsgiserver
except ImportError:
from cheroot.wsgi import Server as wsgiserver
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indent error


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