X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateNodeGroup.py;h=c867e4891318b8ca7f65cad64e26dabb7c99168c;hb=c3fc031363ac794e6b1245c6ed1a05329cba69c9;hp=4c7cec9c24ef8e87d66ac409fafc4dacf606528a;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git

diff --git a/PLC/Methods/UpdateNodeGroup.py b/PLC/Methods/UpdateNodeGroup.py
index 4c7cec9..c867e48 100644
--- a/PLC/Methods/UpdateNodeGroup.py
+++ b/PLC/Methods/UpdateNodeGroup.py
@@ -1,12 +1,10 @@
-# $Id$
-# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.NodeGroups import NodeGroup, NodeGroups
 from PLC.Auth import Auth
 
-can_update = lambda (field, value): field in ['groupname','value']
+can_update = lambda field_value: field_value[0] in ['groupname','value']
 
 class UpdateNodeGroup(Method):
     """
@@ -17,7 +15,7 @@ class UpdateNodeGroup(Method):
 
     roles = ['admin']
 
-    nodegroup_fields = dict(filter(can_update, NodeGroup.fields.items()))
+    nodegroup_fields = dict(list(filter(can_update, list(NodeGroup.fields.items()))))
 
     accepts = [
         Auth(),
@@ -29,12 +27,12 @@ class UpdateNodeGroup(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, nodegroup_id_or_name, nodegroup_fields):
-        nodegroup_fields = dict(filter(can_update, nodegroup_fields.items()))
+        nodegroup_fields = dict(list(filter(can_update, list(nodegroup_fields.items()))))
 
         # Get nodegroup information
         nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
         if not nodegroups:
-            raise PLCInvalidArgument, "No such nodegroup %r"%nodegroup_id_or_name
+            raise PLCInvalidArgument("No such nodegroup %r"%nodegroup_id_or_name)
         nodegroup = nodegroups[0]
 
         nodegroup.update(nodegroup_fields)
@@ -43,5 +41,5 @@ class UpdateNodeGroup(Method):
         # Logging variables
         self.event_objects = {'NodeGroup': [nodegroup['nodegroup_id']]}
         self.message = 'Node group %d updated: %s' % \
-                (nodegroup['nodegroup_id'], ", ".join(nodegroup_fields.keys()))
+                (nodegroup['nodegroup_id'], ", ".join(list(nodegroup_fields.keys())))
         return 1