openstack/keystone
Code Issues Proposed changes

Merge "Remove logic to support pysaml2<3.0.0"

Browse Source
This commit is contained in:
Zuul
2024-09-06 15:48:48 +00:00
committed by Gerrit Code Review
parent afed96b107 170d9f4809
commit 97431ec99b
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/federation/idp.py
View File

@@ -17,7 +17,6 @@ import uuid
from oslo_log import log
from oslo_utils import fileutils
from oslo_utils import importutils
from oslo_utils import timeutils
import saml2
from saml2 import client_base
@@ -27,10 +26,7 @@ from saml2 import saml
from saml2 import samlp
from saml2.schema import soapenv
from saml2 import sigver
xmldsig = importutils.try_import("saml2.xmldsig")
if not xmldsig:
xmldsig = importutils.try_import("xmldsig")
from saml2 import xmldsig
from keystone.common import utils
import keystone.conf

6
keystone/tests/unit/test_v3_federation.py
View File

@@ -24,16 +24,12 @@ import fixtures
import flask
from lxml import etree
from oslo_serialization import jsonutils
from oslo_utils import importutils
import saml2
from saml2 import saml
from saml2 import sigver
from saml2 import xmldsig
from testtools import matchers
xmldsig = importutils.try_import("saml2.xmldsig")
if not xmldsig:
xmldsig = importutils.try_import("xmldsig")
from keystone.api._shared import authentication
from keystone.api import auth as auth_api
from keystone.common import driver_hints