From 2fd63821a1d64e7d8542940a0890dae36dac1578 Mon Sep 17 00:00:00 2001 From: urlbot Date: Sat, 3 Jan 2015 18:42:12 +0100 Subject: [PATCH] cleanup; avoid locking out via 'plugin disable plugin' --- plugins.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins.py b/plugins.py index 378e24a..bbb1512 100644 --- a/plugins.py +++ b/plugins.py @@ -650,7 +650,7 @@ def command_plugin_activation(args): logger('plugin', 'plugin activation plugin called') - if None == command or 'list' == command: + if command in (None, 'list'): return { 'msg': args['reply_user'] + ': known plugins: ' + str([c['name'] for c in plugins['command']])[1:-1] @@ -660,8 +660,12 @@ def command_plugin_activation(args): return { 'msg': args['reply_user'] + ': no plugin given' } + elif 'plugin' == plugin: + return { + 'msg': args['reply_user'] + ': not allowed' + } - if 'enable' == command or 'disable' == command: + if command in ('enable', 'disable'): for i, c in enumerate(plugins['command']): if c['name'] == plugin: plugins['command'][i]['is_enabled'] = \