blind 2to3

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

diff --git a/PLC/Methods/DeleteConfFileFromNodeGroup.py b/PLC/Methods/DeleteConfFileFromNodeGroup.py
index 22523db..96398a9 100644 (file)
--- a/PLC/Methods/DeleteConfFileFromNodeGroup.py
+++ b/PLC/Methods/DeleteConfFileFromNodeGroup.py
@@ -19,33 +19,31 @@ class DeleteConfFileFromNodeGroup(Method):
         Auth(),
         ConfFile.fields['conf_file_id'],
         Mixed(NodeGroup.fields['nodegroup_id'],
-              NodeGroup.fields['name'])
+              NodeGroup.fields['groupname'])
         ]
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'DeleteFrom'
-    object_type = 'ConfFile'
-    object_ids = []
 
     def call(self, auth, conf_file_id, nodegroup_id_or_name):
-       # Get configuration file
+        # Get configuration file
         conf_files = ConfFiles(self.api, [conf_file_id])
         if not conf_files:
-            raise PLCInvalidArgument, "No such configuration file"
-        conf_file = conf_files.values()[0]
+            raise PLCInvalidArgument("No such configuration file")
+        conf_file = conf_files[0]
 
         # Get nodegroup
-       nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
-       if not nodegroups:
-               raise PLCInvalidArgument, "No such nodegroup"
-       nodegroup = nodegroups.values()[0]
-       
-       # Link configuration file to nodegroup
+        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
+        if not nodegroups:
+            raise PLCInvalidArgument("No such nodegroup")
+        nodegroup = nodegroups[0]
+
+        # Link configuration file to nodegroup
         if nodegroup['nodegroup_id'] in conf_file['nodegroup_ids']:
             conf_file.remove_nodegroup(nodegroup)
 
         # Log affected objects
-        self.object_ids = [conf_file_id, nodegroup['nodegroup_id']]
+        self.event_objects = {'ConfFile': [conf_file_id],
+                              'NodeGroup': [nodegroup['nodegroup_id']]}
 
         return 1