RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 23:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31431 from jschmid1/fix_cherrypy_imports

Browse Source 
mgr/dashboard: cheroot moved into a separate project

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-11-12 16:55:47 +08:00 committed by GitHub
commit 943fb9a54a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/dashboard/cherrypy_backports.py
View File

@ -75,7 +75,7 @@ def patch_builtin_ssl_wrap(v, new_wrap):
if v < StrictVersion("9.0.0"):
from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter as builtin_ssl
else:
from cherrypy.cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl
from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl
builtin_ssl.wrap = new_wrap(builtin_ssl.wrap)