Branch 5.0 for module PLCAPI created from tag PLCAPI-4.2-8

[plcapi.git] / PLC / Methods / AdmDeletePersonKeys.py

diff --git a/PLC/Methods/AdmDeletePersonKeys.py b/PLC/Methods/AdmDeletePersonKeys.py
index 0b9cd40..fd24eef 100644 (file)
--- a/PLC/Methods/AdmDeletePersonKeys.py
+++ b/PLC/Methods/AdmDeletePersonKeys.py
@@ -34,8 +34,10 @@ class AdmDeletePersonKeys(Method):
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
+        person = persons[0]
 
-        person = persons.values()[0]
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] != person['person_id']:
@@ -46,7 +48,7 @@ class AdmDeletePersonKeys(Method):
             return 1
 
         # Get associated key details
-        keys = Keys(self.api, key_ids).values()
+        keys = Keys(self.api, key_ids)
 
         for key in keys:
             key.delete()