X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAdmGetSitePowerControlUnits.py;h=b95f29874ddf8d1919d0222387e892cfc850e7ee;hb=d316abf4bdb070ea1acf6be4b262c86a055b6ac2;hp=68aac497c262196b2ba4688cedbccd57dbbc729d;hpb=4a8cf62c77ad97f07c1bac37eb0cc5e8effe72f0;p=plcapi.git

diff --git a/PLC/Methods/AdmGetSitePowerControlUnits.py b/PLC/Methods/AdmGetSitePowerControlUnits.py
index 68aac49..b95f298 100644
--- a/PLC/Methods/AdmGetSitePowerControlUnits.py
+++ b/PLC/Methods/AdmGetSitePowerControlUnits.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.PCUs import PCU, PCUs
 from PLC.Sites import Site, Sites
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class AdmGetSitePowerControlUnits(Method):
     """
@@ -15,7 +15,7 @@ class AdmGetSitePowerControlUnits(Method):
     roles = ['admin', 'pi', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Site.fields['site_id'],
               Site.fields['login_base'])
         ]
@@ -26,15 +26,10 @@ class AdmGetSitePowerControlUnits(Method):
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
-        site = sites.values()[0]
+        site = sites[0]
 
         if 'admin' not in self.caller['roles']:
             if site['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Not allowed to view the PCUs at that site"
 
-        pcus = PCUs(self.api, site['pcu_ids']).values()
-
-	# turn each pcu into a real dict
-	pcus = [dict(pcu) for pcu in pcus]
-
-        return pcus
+        return PCUs(self.api, site['pcu_ids'])