update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / services / sso.py

diff --git a/ceph/src/pybind/mgr/dashboard/services/sso.py b/ceph/src/pybind/mgr/dashboard/services/sso.py
index 534d9fb997001e8b9cb4e7ec9f7a6b0b96eb4961..f2f2a6a7da5b4b2def13aa620f3c3fb8ee1dbf60 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/services/sso.py
+++ b/ceph/src/pybind/mgr/dashboard/services/sso.py
@@ -2,29 +2,23 @@
 # pylint: disable=too-many-return-statements,too-many-branches
 from __future__ import absolute_import
 
-import os
 import errno
 import json
 import logging
+import os
 import threading
 import warnings
-
-import six
-from six.moves.urllib import parse
+from urllib import parse
 
 from .. import mgr
 from ..tools import prepare_url_prefix
 
-
-if six.PY2:
-    FileNotFoundError = IOError  # pylint: disable=redefined-builtin
-
 logger = logging.getLogger('sso')
 
 try:
-    from onelogin.saml2.settings import OneLogin_Saml2_Settings as Saml2Settings
     from onelogin.saml2.errors import OneLogin_Saml2_Error as Saml2Error
     from onelogin.saml2.idp_metadata_parser import OneLogin_Saml2_IdPMetadataParser as Saml2Parser
+    from onelogin.saml2.settings import OneLogin_Saml2_Settings as Saml2Settings
 
     python_saml_imported = True
 except ImportError:
@@ -163,7 +157,7 @@ def handle_sso_command(cmd):
             Saml2Settings(mgr.SSO_DB.saml2.onelogin_settings)
         except Saml2Error:
             return -errno.EPERM, '', 'Single Sign-On is not configured: ' \
-                          'use `ceph dashboard sso setup saml2`'
+                'use `ceph dashboard sso setup saml2`'
         mgr.SSO_DB.protocol = 'saml2'
         mgr.SSO_DB.save()
         return 0, 'SSO is "enabled" with "SAML2" protocol.', ''