X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fclient_helper.py;h=809831942035d720f36d4e11bc69f983dde0c4ea;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=fd15c0fe2c2e50e0b5887a251842fa0946bb0680;hpb=8e558be62ca1e048cedb76d6036d1acbfa827bd4;p=sfa.git diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py index fd15c0fe..80983194 100644 --- a/sfa/client/client_helper.py +++ b/sfa/client/client_helper.py @@ -41,10 +41,8 @@ def sfa_users_arg(records, slice_record): # note that reg-email is not yet available pl_fields = ['email', 'person_id', 'first_name', 'last_name', 'key_ids'] - nitos_fields = ['email', 'user_id'] - extra_fields = list(set(pl_fields).union(set(nitos_fields))) # try to fill all these in - for field in extra_fields: + for field in pl_fields: if field in record: user[field] = record[field] users.append(user) @@ -57,7 +55,7 @@ def sfa_to_pg_users_arg(users): new_users = [] fields = ['urn', 'keys'] for user in users: - new_user = dict([item for item in user.items() + new_user = dict([item for item in list(user.items()) if item[0] in fields]) new_users.append(new_user) return new_users