Removed remaining problems from merge.

diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py
index 32e21a1..8f9876c 100644 (file)
--- a/sfa/client/client_helper.py
+++ b/sfa/client/client_helper.py
@@ -18,8 +18,8 @@ def sfa_users_arg(records, slice_record):
                 'keys': record['keys'],
                 'email': record['email'], # needed for MyPLC
                 'person_id': record['person_id'], # needed for MyPLC
-                'first_name': record['first_name'], # needed for MyPLC
-                'last_name': record['last_name'], # needed for MyPLC
+                #'first_name': record['first_name'], # needed for MyPLC
+                #'last_name': record['last_name'], # needed for MyPLC
                 'slice_record': slice_record, # needed for legacy refresh peer
                 'key_ids': record['key_ids'] # needed for legacy refresh peer
                 }         

diff --git a/sfa/managers/registry_manager_slab.py b/sfa/managers/registry_manager_slab.py
index 970dbe8..b30ca93 100644 (file)
--- a/sfa/managers/registry_manager_slab.py
+++ b/sfa/managers/registry_manager_slab.py
@@ -230,7 +230,7 @@ def register(api, record):
         raise ExistingRecord(hrn)
        
     record = SfaRecord(dict = record)
-<<<<<<< HEAD
+
     print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAN.PY  register  SfaRecordrecord %s" %(record)
     #record['authority'] = get_authority(record['hrn'])
     record['authority'] = get_authority(hrn)

diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index 41c71cf..de0af99 100644 (file)
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -220,13 +220,15 @@ class Auth:
         @param name human readable name to test  
         """
         object_hrn = self.object_gid.get_hrn()
-        if object_hrn == name:
+       strname = str(name).strip("['']")
+       
+        if object_hrn == strname:
             return
-        if name.startswith(object_hrn + "."):
+        if strname.startswith((object_hrn + ".")) is True:
             return
         #if name.startswith(get_authority(name)):
             #return
-    
+       print>>sys.stderr, " \r\n \t AUTH.PY  verify_object_permission GROSECHECDELENFER "
         raise PermissionError(name)
 
     def determine_user_rights(self, caller_hrn, record):