[general] Refactoring

* remove (hopefully) unnecessary import statements
* make some code a bit more compact
* remove dead code ... again: hopefully so
This commit is contained in:
Tobias Witek 2016-11-05 15:54:34 +01:00
parent e889098c77
commit 3af8ee771d
4 changed files with 2 additions and 35 deletions

View file

@ -71,18 +71,11 @@ class Output(object):
)] = cmd
def callback(self, event):
module = event.get("instance", event.get("name", None))
cb = self._callbacks.get((
event.get("button", -1),
None,
module,
), None)
cb = self._callbacks.get((
event.get("button", -1),
event.get("name", None),
), cb)
cb = self._callbacks.get((
event.get("button", -1),
event.get("instance", None),
), cb)
if inspect.isfunction(cb) or cb is None: return cb
return Command(cb)