aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-12-15 14:34:40 +1300
committerAldo Cortesi <aldo@nullcube.com>2017-12-15 16:02:34 +1300
commitea891b43f836047c57409415788ecd8a69f57638 (patch)
treee92f68879347ce7fd6ac70312df2576c74e855ac
parent582e6a9fa62eeba05561ba2105bf7c8a73211b4d (diff)
downloadmitmproxy-ea891b43f836047c57409415788ecd8a69f57638.tar.gz
mitmproxy-ea891b43f836047c57409415788ecd8a69f57638.tar.bz2
mitmproxy-ea891b43f836047c57409415788ecd8a69f57638.zip
console: fix variable clash exposed by recent key binding work
-rw-r--r--mitmproxy/tools/console/consoleaddons.py2
-rw-r--r--mitmproxy/tools/console/keybindings.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/tools/console/consoleaddons.py b/mitmproxy/tools/console/consoleaddons.py
index 87f794c2..61e107f4 100644
--- a/mitmproxy/tools/console/consoleaddons.py
+++ b/mitmproxy/tools/console/consoleaddons.py
@@ -513,7 +513,7 @@ class ConsoleAddon:
kwidget = self.master.window.current("keybindings")
if not kwidget:
raise exceptions.CommandError("Not viewing key bindings.")
- f = kwidget.focus()
+ f = kwidget.get_focused_binding()
if not f:
raise exceptions.CommandError("No key binding focused")
return f
diff --git a/mitmproxy/tools/console/keybindings.py b/mitmproxy/tools/console/keybindings.py
index 45f5c33c..312c19f9 100644
--- a/mitmproxy/tools/console/keybindings.py
+++ b/mitmproxy/tools/console/keybindings.py
@@ -135,7 +135,7 @@ class KeyBindings(urwid.Pile, layoutwidget.LayoutWidget):
)
self.master = master
- def focus(self):
+ def get_focused_binding(self):
if self.focus_position != 0:
return None
f = self.widget_list[0]