openstack/deb-python-pysaml2
Code Issues Proposed changes

editorial

Browse Source
This commit is contained in:
Roland Hedberg
2011-03-14 21:54:01 +01:00
parent 67a7aa9973
commit f44234b653
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/saml2/config.py
View File

@@ -7,7 +7,7 @@ import sys
from saml2 import metadata from saml2 import metadata
from saml2.assertion import Policy from saml2.assertion import Policy
from saml2.attribute_converter import ac_factory, AttributeConverter from saml2.attribute_converter import ac_factory, AttributeConverter
from saml2 import BINDING_HTTP_REDIRECT, BINDING_HTTP_POST, BINDING_SOAP from saml2 import BINDING_HTTP_REDIRECT, BINDING_SOAP
from saml2.metadata import ENDPOINTS, DEFAULT_BINDING from saml2.metadata import ENDPOINTS, DEFAULT_BINDING
class MissingValue(Exception): class MissingValue(Exception):
@@ -28,7 +28,8 @@ def entity_id2url(meta, entity_id):
if val: if val:
res[typ] = val res[typ] = val
return res return res
class Config(dict): class Config(dict):
def load_metadata(self, metadata_conf, xmlsec_binary, acs): def load_metadata(self, metadata_conf, xmlsec_binary, acs):
""" Loads metadata into an internal structure """ """ Loads metadata into an internal structure """
@@ -62,8 +63,7 @@ class Config(dict):
config["key_file"] = None config["key_file"] = None
if "attribute_map_dir" in config: if "attribute_map_dir" in config:
config["attrconverters"] = ac_factory( config["attrconverters"] = ac_factory(config["attribute_map_dir"])
config["attribute_map_dir"])
else: else:
config["attrconverters"] = [AttributeConverter()] config["attrconverters"] = [AttributeConverter()]