From 5bcb6ac24a15c40a74cfd0756a5dfc045ad155cf Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Wed, 5 Jul 2017 19:05:22 +0300 Subject: [PATCH] Minor fixes --- src/saml2/assertion.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/saml2/assertion.py b/src/saml2/assertion.py index a9e3372..0db4b72 100644 --- a/src/saml2/assertion.py +++ b/src/saml2/assertion.py @@ -78,18 +78,15 @@ def filter_on_attributes(ava, required=None, optional=None, acs=None, """ def _match_attr_name(attr, ava): - try: - friendly_name = get_local_name(acs, attr["name"], - attr["name_format"]) - except: - friendly_name = None - if not friendly_name: + + local_name = get_local_name(acs, attr["name"], attr["name_format"]) + if not local_name: try: - friendly_name = attr["friendly_name"] + local_name = attr["friendly_name"] except KeyError: pass - _fn = _match(friendly_name, ava) + _fn = _match(local_name, ava) if not _fn: # In the unlikely case that someone has provided us with # URIs as attribute names _fn = _match(attr["name"], ava)