This commit was manufactured by cvs2svn to create branch

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

diff --git a/PLC/Methods/AdmGetPersonKeys.py b/PLC/Methods/AdmGetPersonKeys.py
index 965ee55..ab39d07 100644 (file)
--- a/PLC/Methods/AdmGetPersonKeys.py
+++ b/PLC/Methods/AdmGetPersonKeys.py
@@ -1,3 +1,9 @@
+from PLC.Faults import *
+from PLC.Method import Method
+from PLC.Parameter import Parameter, Mixed
+from PLC.Persons import Person, Persons
+from PLC.Keys import Key, Keys
+from PLC.Auth import Auth
 from PLC.Methods.GetKeys import GetKeys
 
 class AdmGetPersonKeys(GetKeys):
@@ -11,7 +17,7 @@ class AdmGetPersonKeys(GetKeys):
     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email']),
         [Key.fields['key_id']]
@@ -25,7 +31,7 @@ class AdmGetPersonKeys(GetKeys):
         if not persons:
             raise PLCInvalidArgument, "No such account"
 
-        person = persons.values()[0]
+        person = persons[0]
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] != person['person_id']: