From 9097316eda854035caa5a3312856d21ffcfe5a9a Mon Sep 17 00:00:00 2001
From: Roland Hedberg <roland.hedberg@adm.umu.se>
Date: Fri, 20 Nov 2009 14:30:18 +0100
Subject: [PATCH] completed the update to follow changes in saml2.client

---
 src/saml2/attribute_resolver.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/saml2/attribute_resolver.py b/src/saml2/attribute_resolver.py
index 4d44fa4..f307b84 100644
--- a/src/saml2/attribute_resolver.py
+++ b/src/saml2/attribute_resolver.py
@@ -55,21 +55,18 @@ class AttributeResolver(object):
         :return: A dictionary with all the collected information about the
             subject
         """
-        extended_identity = {}
+        result = []
         for member in vo_members:            
             for ass in self.metadata.attribute_services(member):
                 for attr_serv in ass.attribute_service:
                     log and log.info("Send attribute request to %s" % \
                                         attr_serv.location)
-                    (resp, issuer, 
-                        not_on_or_after) = self.saml2client.attribute_query(
+                    session_info = self.saml2client.attribute_query(
                                 subject_id, 
                                 issuer, 
                                 attr_serv.location, 
                                 sp_name_qualifier=sp_name_qualifier,
                                 format=name_id_format, log=log)
-                    if resp:
-                        # unnecessary
-                        del resp["__userid"]
-                        extended_identity[issuer] = (not_on_or_after, resp)                    
-        return extended_identity
\ No newline at end of file
+                    if session_info:
+                        result.append(session_info)
+        return result
\ No newline at end of file