X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fclient_helper.py;h=82b5f1991c8a36e46a37082520e35a866b39d7d8;hb=1a9718ae903eef6c6485c851a81c2f794e971ea2;hp=d9239ad92b45e8635aa6a21192306e83392a7bfb;hpb=1622da11642665d92f31787d692289d4932f2586;p=sfa.git

diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py
index d9239ad9..82b5f199 100644
--- a/sfa/client/client_helper.py
+++ b/sfa/client/client_helper.py
@@ -14,21 +14,24 @@
 # the fact e.g. that PlanetLab insists on getting a first_name and last_name is not
 # exactly consistent with the GENI spec. of CreateSliver
 #
+
+
 def pg_users_arg(records):
-    users = []  
+    users = []
     for record in records:
-        if record['type'] != 'user': 
+        if record['type'] != 'user':
             continue
         user = {'urn': record['reg-urn'],
                 'keys': record['reg-keys'],
                 'email': record['email']}
         users.append(user)
-    return users    
+    return users
+
 
-def sfa_users_arg (records, slice_record):
+def sfa_users_arg(records, slice_record):
     users = []
     for record in records:
-        if record['type'] != 'user': 
+        if record['type'] != 'user':
             continue
         user = {'urn': record['reg-urn'],
                 'keys': record['reg-keys'],
@@ -36,22 +39,23 @@ def sfa_users_arg (records, slice_record):
                 }
         # fill as much stuff as possible from planetlab or similar
         # 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)))
+        pl_fields = ['email', 'person_id',
+                     'first_name', 'last_name', 'key_ids']
         # try to fill all these in
-        for field in extra_fields:
-            if record.has_key(field): user[field]=record[field]
+        for field in pl_fields:
+            if field in record:
+                user[field] = record[field]
         users.append(user)
 
     return users
 
+
 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() \
-          if item[0] in fields])
+        new_user = dict([item for item in user.items()
+                         if item[0] in fields])
         new_users.append(new_user)
-    return new_users        
+    return new_users