diff options
| author | Javier Pena <jpena@redhat.com> | 2015-05-20 11:32:18 +0200 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2015-07-13 15:21:09 -0500 |
| commit | 523cffaf2425212112a9372d6ac8d38ae9344100 (patch) | |
| tree | f197727e91f6a97740fb9d81704915c3412ce2c2 | |
| parent | 5ca4e59f28c40bd326005d82c8a6f67ae1c427f5 (diff) | |
| download | keystone-523cffaf2425212112a9372d6ac8d38ae9344100.tar.gz | |
Fix xmldsig import
After commit https://goo.gl/TjLQFz to pysaml2, xmldsig was moved
under saml2, no longer being at the top level. Craeting a
conditional import, so it can work now and when the pysaml2
commit is included in a new release.
Conflicts:
keystone/contrib/federation/idp.py
keystone/tests/unit/test_v3_federation.py
Change-Id: If01a93a18cef6159adad50496e6335e88f86024d
(cherry picked from commit c90dd3a0f8280e28bbbff691c0ae27aff736658a)
(cherry picked from commit afaaf1180bbab364fb4237d995248304f9cb6c0b)
| -rw-r--r-- | keystone/contrib/federation/idp.py | 6 | ||||
| -rw-r--r-- | keystone/tests/test_v3_federation.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/keystone/contrib/federation/idp.py b/keystone/contrib/federation/idp.py index 49d6b67ed..46ad27442 100644 --- a/keystone/contrib/federation/idp.py +++ b/keystone/contrib/federation/idp.py @@ -20,15 +20,19 @@ from saml2 import md from saml2 import saml from saml2 import samlp from saml2 import sigver -import xmldsig from keystone.common import config from keystone import exception from keystone.i18n import _, _LE from keystone.openstack.common import fileutils +from keystone.openstack.common import importutils from keystone.openstack.common import log from keystone.openstack.common import timeutils +xmldsig = importutils.try_import("saml2.xmldsig") +if not xmldsig: + xmldsig = importutils.try_import("xmldsig") + LOG = log.getLogger(__name__) CONF = config.CONF diff --git a/keystone/tests/test_v3_federation.py b/keystone/tests/test_v3_federation.py index 202e61c98..de270d9ce 100644 --- a/keystone/tests/test_v3_federation.py +++ b/keystone/tests/test_v3_federation.py @@ -21,7 +21,6 @@ from oslotest import mockpatch import saml2 from saml2 import saml from saml2 import sigver -import xmldsig from keystone.auth import controllers as auth_controllers from keystone.common import dependency @@ -32,12 +31,17 @@ from keystone.contrib.federation import idp as keystone_idp from keystone.contrib.federation import utils as mapping_utils from keystone import exception from keystone import notifications +from keystone.openstack.common import importutils from keystone.openstack.common import jsonutils from keystone.openstack.common import log from keystone.tests import federation_fixtures from keystone.tests import mapping_fixtures from keystone.tests import test_v3 +xmldsig = importutils.try_import("saml2.xmldsig") +if not xmldsig: + xmldsig = importutils.try_import("xmldsig") + CONF = config.CONF LOG = log.getLogger(__name__) |