summaryrefslogtreecommitdiff
path: root/src/saml2/config.py
diff options
context:
space:
mode:
authorRoland Hedberg <roland.hedberg@adm.umu.se>2015-12-01 12:53:35 +0100
committerRoland Hedberg <roland.hedberg@adm.umu.se>2015-12-01 12:53:35 +0100
commit883b89efb07acf6e28eb177f9f582aad1e33ba58 (patch)
tree733e979d4790241f1874b15f98f2bae33429a90e /src/saml2/config.py
parentcff1391d73a4e81bf53ff11017b40bd016d82010 (diff)
downloadpysaml2-883b89efb07acf6e28eb177f9f582aad1e33ba58.tar.gz
Made MetaData instances pickleable.
Diffstat (limited to 'src/saml2/config.py')
-rw-r--r--src/saml2/config.py24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/saml2/config.py b/src/saml2/config.py
index f0baa1ff..952526f9 100644
--- a/src/saml2/config.py
+++ b/src/saml2/config.py
@@ -26,27 +26,6 @@ from saml2.virtual_org import VirtualOrg
logger = logging.getLogger(__name__)
-from saml2 import md
-from saml2 import saml
-from saml2.extension import mdui
-from saml2.extension import idpdisc
-from saml2.extension import dri
-from saml2.extension import mdattr
-from saml2.extension import ui
-from saml2 import xmldsig
-from saml2 import xmlenc
-
-ONTS = {
- saml.NAMESPACE: saml,
- mdui.NAMESPACE: mdui,
- mdattr.NAMESPACE: mdattr,
- dri.NAMESPACE: dri,
- ui.NAMESPACE: ui,
- idpdisc.NAMESPACE: idpdisc,
- md.NAMESPACE: md,
- xmldsig.NAMESPACE: xmldsig,
- xmlenc.NAMESPACE: xmlenc
-}
COMMON_ARGS = [
"entityid", "xmlsec_binary", "debug", "key_file", "cert_file",
@@ -408,8 +387,7 @@ class Config(object):
except:
disable_validation = False
- mds = MetadataStore(
- list(ONTS.values()), acs, self, ca_certs,
+ mds = MetadataStore(acs, self, ca_certs,
disable_ssl_certificate_validation=disable_validation)
mds.imp(metadata_conf)