X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdatePCU.py;h=84c35730eefe2092b36eb70b95a0ec3569f43e29;hb=3b44c0228c26dc43d985185afc225caa5f48c1fb;hp=fb17176e1aa0de225a55d0cd1c6d937a38cb90a5;hpb=997c5bbe5b0576ae8c9c8d52a80dab1dcecf615a;p=plcapi.git diff --git a/PLC/Methods/UpdatePCU.py b/PLC/Methods/UpdatePCU.py index fb17176..84c3573 100644 --- a/PLC/Methods/UpdatePCU.py +++ b/PLC/Methods/UpdatePCU.py @@ -4,7 +4,7 @@ from PLC.Parameter import Parameter, Mixed from PLC.PCUs import PCU, PCUs from PLC.Auth import Auth -can_update = lambda (field, value): field not in \ +can_update = lambda field_value: field_value[0] not in \ ['pcu_id', 'site_id'] class UpdatePCU(Method): @@ -19,7 +19,7 @@ class UpdatePCU(Method): roles = ['admin', 'pi', 'tech'] - update_fields = dict(filter(can_update, PCU.fields.items())) + update_fields = dict(list(filter(can_update, list(PCU.fields.items())))) accepts = [ Auth(), @@ -30,17 +30,17 @@ class UpdatePCU(Method): returns = Parameter(int, '1 if successful') def call(self, auth, pcu_id, pcu_fields): - pcu_fields = dict(filter(can_update, pcu_fields.items())) + pcu_fields = dict(list(filter(can_update, list(pcu_fields.items())))) # Get associated PCU details pcus = PCUs(self.api, [pcu_id]) if not pcus: - raise PLCInvalidArgument, "No such PCU" + raise PLCInvalidArgument("No such PCU") pcu = pcus[0] if 'admin' not in self.caller['roles']: if pcu['site_id'] not in self.caller['site_ids']: - raise PLCPermissionDenied, "Not allowed to update that PCU" + raise PLCPermissionDenied("Not allowed to update that PCU") pcu.update(pcu_fields) pcu.update_last_updated(commit=False) @@ -49,5 +49,5 @@ class UpdatePCU(Method): # Logging variables self.event_objects = {'PCU': [pcu['pcu_id']]} self.message = 'PCU %d updated: %s' % \ - (pcu['pcu_id'], ", ".join(pcu_fields.keys())) + (pcu['pcu_id'], ", ".join(list(pcu_fields.keys()))) return 1