git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blind 2to3
[plcapi.git]
/
PLC
/
Methods
/
UpdatePCU.py
diff --git
a/PLC/Methods/UpdatePCU.py
b/PLC/Methods/UpdatePCU.py
index
fb17176
..
84c3573
100644
(file)
--- 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
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):
['pcu_id', 'site_id']
class UpdatePCU(Method):
@@
-19,7
+19,7
@@
class UpdatePCU(Method):
roles = ['admin', 'pi', 'tech']
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(),
accepts = [
Auth(),
@@
-30,17
+30,17
@@
class UpdatePCU(Method):
returns = Parameter(int, '1 if successful')
def call(self, auth, pcu_id, pcu_fields):
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:
# 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']:
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)
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' % \
# 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
return 1