From ec7dd75012bafd5281e88aa83c54547cb3b36bf5 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 29 Jul 2012 19:45:46 +0200 Subject: /bind with only one argument now resets the binding --- src/common.py | 8 ++++---- src/core.py | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/common.py b/src/common.py index 26b5dd0f..23912411 100644 --- a/src/common.py +++ b/src/common.py @@ -188,10 +188,10 @@ def shell_split(st): return st.split(" ") def replace_key_with_bound(key): - if config.has_option('bindings', key): - return config.get(key, key, 'bindings') - else: - return key + bind = config.get(key, key, 'bindings') + if not bind: + bind = key + return bind def parse_str_to_secs(duration=''): """ diff --git a/src/core.py b/src/core.py index b783f538..e7897c59 100644 --- a/src/core.py +++ b/src/core.py @@ -1945,10 +1945,15 @@ class Core(object): Bind a key. """ args = common.shell_split(arg) - if len(args) != 2: + if len(args) < 1: return self.command_help('bind') + elif len(args) < 2: + args.append("") config.set_and_save(args[0], args[1], section='bindings') - self.information('%s is now bound to %s' % (args[0], args[1]), 'Info') + if args[1]: + self.information('%s is now bound to %s' % (args[0], args[1]), 'Info') + else: + self.information('%s is now unbound' % args[0], 'Info') def command_pubsub(self, args): """ -- cgit v1.2.3