git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
57e9d16
..
7653fa9
100644
(file)
--- a/
PLC/Methods/DeleteKey.py
+++ b/
PLC/Methods/DeleteKey.py
@@
-1,4
+1,3
@@
-# $Id#
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
@@
-28,20
+27,20
@@
class DeleteKey(Method):
# Get associated key details
keys = Keys(self.api, [key_id])
if not keys:
# 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]
if key['peer_id'] is not None:
key = keys[0]
if key['peer_id'] is not None:
- raise PLCInvalidArgument
, "Not a local key"
+ raise PLCInvalidArgument
("Not a local key")
if 'admin' not in self.caller['roles']:
if key['key_id'] not in self.caller['key_ids']:
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()
key.delete()
-
- # Logging variables
- self.event_objects = {'Key': [key['key_id']]}
- self.message = 'Key %d deleted' % key['key_id']
+
+
# Logging variables
+
self.event_objects = {'Key': [key['key_id']]}
+
self.message = 'Key %d deleted' % key['key_id']
return 1
return 1