Notice: curl_setopt(): CURLOPT_SSL_VERIFYHOST no longer accepts the value 1, value...

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

diff --git a/PLC/Methods/DeleteKey.py b/PLC/Methods/DeleteKey.py
index d3eb68d..7653fa9 100644 (file)
--- a/PLC/Methods/DeleteKey.py
+++ b/PLC/Methods/DeleteKey.py
@@ -27,15 +27,20 @@ class DeleteKey(Method):
         # Get associated key details
         keys = Keys(self.api, [key_id])
         if not keys:
-            raise PLCInvalidArgument, "No such key"
+            raise PLCInvalidArgument("No such key")
         key = keys[0]
-       PLCCheckLocalKey(key,"DeleteKey")
+
+        if key['peer_id'] is not None:
+            raise PLCInvalidArgument("Not a local key")
 
         if 'admin' not in self.caller['roles']:
             if key['key_id'] not in self.caller['key_ids']:
-                raise PLCPermissionDenied, "Key must be associated with your account"
+                raise PLCPermissionDenied("Key must be associated with your account")
 
         key.delete()
-       self.object_ids = [key['key_id']]
+
+        # Logging variables
+        self.event_objects = {'Key': [key['key_id']]}
+        self.message = 'Key %d deleted' % key['key_id']
 
         return 1