diff options
Diffstat (limited to 'src/saml2/mdie.py')
| -rw-r--r-- | src/saml2/mdie.py | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/src/saml2/mdie.py b/src/saml2/mdie.py index 1bbe3e8d..9a741495 100644 --- a/src/saml2/mdie.py +++ b/src/saml2/mdie.py @@ -1,13 +1,14 @@ #!/usr/bin/env python import six -from saml2 import element_to_extension_element -from saml2 import extension_elements_to_elements from saml2 import ExtensionElement from saml2 import SamlBase +from saml2 import element_to_extension_element +from saml2 import extension_elements_to_elements from saml2 import md -__author__ = 'rolandh' + +__author__ = "rolandh" """ Functions used to import metadata from and export it to a pysaml2 format @@ -31,20 +32,12 @@ def _eval(val, onts, mdb_safe): return None else: return val - elif ( - isinstance(val, dict) - or isinstance(val, SamlBase) - or isinstance(val, ExtensionElement) - ): + elif isinstance(val, dict) or isinstance(val, SamlBase) or isinstance(val, ExtensionElement): return to_dict(val, onts, mdb_safe) elif isinstance(val, list): lv = [] for v in val: - if ( - isinstance(v, dict) - or isinstance(v, SamlBase) - or isinstance(v, ExtensionElement) - ): + if isinstance(v, dict) or isinstance(v, SamlBase) or isinstance(v, ExtensionElement): lv.append(to_dict(v, onts, mdb_safe)) else: lv.append(v) @@ -70,15 +63,12 @@ def to_dict(_dict, onts, mdb_safe=False): continue val = getattr(_dict, key) if key == "extension_elements": - _eel = extension_elements_to_elements( - val, onts, keep_unmatched=True - ) + _eel = extension_elements_to_elements(val, onts, keep_unmatched=True) _val = [_eval(_v, onts, mdb_safe) for _v in _eel] elif key == "extension_attributes": if mdb_safe: - _val = dict([(k.replace(".", "__"), v) for k, v in - val.items()]) - #_val = {k.replace(".", "__"): v for k, v in val.items()} + _val = dict([(k.replace(".", "__"), v) for k, v in val.items()]) + # _val = {k.replace(".", "__"): v for k, v in val.items()} else: _val = val else: @@ -109,6 +99,7 @@ def to_dict(_dict, onts, mdb_safe=False): # From Python dictionary to pysaml2 SAML2 metadata format + def _kwa(val, onts, mdb_safe=False): """ Key word argument conversion @@ -119,13 +110,11 @@ def _kwa(val, onts, mdb_safe=False): :return: A converted dictionary """ if not mdb_safe: - return dict([(k, from_dict(v, onts)) for k, v in val.items() - if k not in EXP_SKIP]) + return dict([(k, from_dict(v, onts)) for k, v in val.items() if k not in EXP_SKIP]) else: _skip = ["_id"] _skip.extend(EXP_SKIP) - return dict([(k.replace("__", "."), from_dict(v, onts)) for k, v in - val.items() if k not in _skip]) + return dict([(k.replace("__", "."), from_dict(v, onts)) for k, v in val.items() if k not in _skip]) def from_dict(val, onts, mdb_safe=False): |