blind 2to3

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

diff --git a/PLC/Methods/DeleteSliceFromNodesWhitelist.py b/PLC/Methods/DeleteSliceFromNodesWhitelist.py
index eeceeb7..0e2b67a 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodesWhitelist.py
+++ b/PLC/Methods/DeleteSliceFromNodesWhitelist.py
@@ -1,4 +1,3 @@
-# $Id#
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -23,7 +22,7 @@ class DeleteSliceFromNodesWhitelist(Method):
         Auth(),
         Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
-       [Mixed(Node.fields['node_id'],
+        [Mixed(Node.fields['node_id'],
                Node.fields['hostname'])]
         ]
 
@@ -33,23 +32,23 @@ class DeleteSliceFromNodesWhitelist(Method):
         # Get slice information
         slices = Slices(self.api, [slice_id_or_name])
         if not slices:
-            raise PLCInvalidArgument, "No such slice"
+            raise PLCInvalidArgument("No such slice")
         slice = slices[0]
 
         if slice['peer_id'] is not None:
-            raise PLCInvalidArgument, "Not a local slice"
+            raise PLCInvalidArgument("Not a local slice")
 
-        # Get specified nodes, add them to the slice         
+        # Get specified nodes, add them to the slice
         nodes = Nodes(self.api, node_id_or_hostname_list)
-       for node in nodes:
+        for node in nodes:
             if node['peer_id'] is not None:
-                raise PLCInvalidArgument, "%s not a local node" % node['hostname']
-           if slice['slice_id'] in node['slice_ids_whitelist']:
+                raise PLCInvalidArgument("%s not a local node" % node['hostname'])
+            if slice['slice_id'] in node['slice_ids_whitelist']:
                 slice.delete_from_node_whitelist(node, commit = False)
 
         slice.sync()
 
-       self.event_objects = {'Node': [node['node_id'] for node in nodes],
-                             'Slice': [slice['slice_id']]}
+        self.event_objects = {'Node': [node['node_id'] for node in nodes],
+                              'Slice': [slice['slice_id']]}
 
         return 1