summaryrefslogtreecommitdiffstats
path: root/Reaktor
diff options
context:
space:
mode:
Diffstat (limited to 'Reaktor')
-rw-r--r--Reaktor/TODO1
-rwxr-xr-xReaktor/commands/caps9
2 files changed, 1 insertions, 9 deletions
diff --git a/Reaktor/TODO b/Reaktor/TODO
index 995db2af..8eb4073d 100644
--- a/Reaktor/TODO
+++ b/Reaktor/TODO
@@ -1,6 +1,5 @@
commands/caps: merge load_config with IRC/getconf.py
commands/caps: generalize for UDP
-commands/caps: replace map/filter with more pythonic way
getconf: reload inotify
diff --git a/Reaktor/commands/caps b/Reaktor/commands/caps
index eb1d97a6..a9ce4519 100755
--- a/Reaktor/commands/caps
+++ b/Reaktor/commands/caps
@@ -8,12 +8,5 @@ def load_config(filename):
file, pathname, description = imp.find_module(modname, [ dirname ])
return imp.load_module(modname, file, pathname, description)
-def not_none(x):
- return x != None
-
-def pluck(name):
- return lambda x: name in x.keys() and x[name] or None
-
config = load_config(os.environ['config_filename'])
-
-print(' '.join(filter(not_none, map(pluck('capname'), config.irc_commands))))
+print(' '.join(filter(None,[ x.get('capname',None) for x in config.irc_commands])))