blind 2to3

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

diff --git a/PLC/Methods/AddNodeGroup.py b/PLC/Methods/AddNodeGroup.py
index 651c7b1..2beed71 100644 (file)
--- a/PLC/Methods/AddNodeGroup.py
+++ b/PLC/Methods/AddNodeGroup.py
@@ -1,4 +1,3 @@
-# $Id$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -8,7 +7,7 @@ from PLC.NodeGroups import NodeGroup, NodeGroups
 from PLC.TagTypes import TagType, TagTypes
 from PLC.NodeTags import NodeTag, NodeTags
 
-can_update = lambda (field, value): field in NodeGroup.fields.keys() and field != NodeGroup.primary_field
+can_update = lambda field_value: field_value[0] in list(NodeGroup.fields.keys()) and field_value[0] != NodeGroup.primary_field
 
 class AddNodeGroup(Method):
     """
@@ -20,7 +19,7 @@ class AddNodeGroup(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(),
@@ -37,7 +36,7 @@ class AddNodeGroup(Method):
         # locate tag type
         tag_types = TagTypes (self.api,[tag_type_id_or_tagname])
         if not(tag_types):
-            raise PLCInvalidArgument, "No such tag type %r"%tag_type_id_or_tagname
+            raise PLCInvalidArgument("No such tag type %r"%tag_type_id_or_tagname)
         tag_type=tag_types[0]
 
         nodegroup_fields = { 'groupname' : groupname,
@@ -46,8 +45,8 @@ class AddNodeGroup(Method):
         nodegroup = NodeGroup(self.api, nodegroup_fields)
         nodegroup.sync()
 
-       # Logging variables
-       self.event_objects = {'NodeGroup': [nodegroup['nodegroup_id']]}
-       self.message = 'Node group %d created' % nodegroup['nodegroup_id']
- 
+        # Logging variables
+        self.event_objects = {'NodeGroup': [nodegroup['nodegroup_id']]}
+        self.message = 'Node group %d created' % nodegroup['nodegroup_id']
+
         return nodegroup['nodegroup_id']