Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/AdmGetSitePowerControlUnits.py b/PLC/Methods/AdmGetSitePowerControlUnits.py
index 8128b0b..b95f298 100644 (file)
--- 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,10 +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"
 
-        return PCUs(self.api, site['pcu_ids']).values()
+        return PCUs(self.api, site['pcu_ids'])