From: Sebastian Wagner Date: Tue, 4 Jan 2022 13:56:12 +0000 (+0100) Subject: mgr/dashboard: cheroot now ships type hints X-Git-Tag: v17.1.0~151^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f05e5ebcdffea4f5090f8b3213f512fc8a4394a;p=ceph.git mgr/dashboard: cheroot now ships type hints Now we need to prevent mypy frm complainign about a duplicated import. Signed-off-by: Sebastian Wagner --- diff --git a/src/mypy.ini b/src/mypy.ini index 0510b2e1d8b..bd4b436b492 100755 --- a/src/mypy.ini +++ b/src/mypy.ini @@ -56,9 +56,6 @@ ignore_missing_imports = True [mypy-cherrypy.*] ignore_missing_imports = True -[mypy-cheroot.*] -ignore_missing_imports = True - [mypy-bcrypt] ignore_missing_imports = True diff --git a/src/pybind/mgr/dashboard/cherrypy_backports.py b/src/pybind/mgr/dashboard/cherrypy_backports.py index 4fc59ba0605..9be4c9ba9f7 100644 --- a/src/pybind/mgr/dashboard/cherrypy_backports.py +++ b/src/pybind/mgr/dashboard/cherrypy_backports.py @@ -74,7 +74,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 cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl + from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl # type: ignore builtin_ssl.wrap = new_wrap(builtin_ssl.wrap)