fix packaging for f37 (4/n)

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

diff --git a/PLC/Methods/DeleteSlice.py b/PLC/Methods/DeleteSlice.py
index d2d4be8..49df6ea 100644 (file)
--- a/PLC/Methods/DeleteSlice.py
+++ b/PLC/Methods/DeleteSlice.py
@@ -1,11 +1,8 @@
-# $Id$
-# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Slices import Slice, Slices
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 class DeleteSlice(Method):
     """
@@ -31,24 +28,21 @@ class DeleteSlice(Method):
     def call(self, auth, slice_id_or_name):
         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")
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] in slice['person_ids']:
                 pass
             elif 'pi' not in self.caller['roles']:
-                raise PLCPermissionDenied, "Not a member of the specified slice"
+                raise PLCPermissionDenied("Not a member of the specified slice")
             elif slice['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
+                raise PLCPermissionDenied("Specified slice not associated with any of your sites")
 
         slice.delete()
         self.event_objects = {'Slice': [slice['slice_id']]}
 
-        sfa = SFA(self.api)
-        sfa.delete_record(slice, 'slice')
-
         return 1