aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools/console/grideditor
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-06-11 21:55:31 +1200
committerAldo Cortesi <aldo@nullcube.com>2017-06-11 21:55:31 +1200
commit9c57508fde3d238e80d4dec1174ee6515cce2dae (patch)
tree155ed2c0c3cfd492a6a86b24962f63365f7f7fd4 /mitmproxy/tools/console/grideditor
parent60de6e6d1e7ff7474a18ac006d4258e49f909582 (diff)
downloadmitmproxy-9c57508fde3d238e80d4dec1174ee6515cce2dae.tar.gz
mitmproxy-9c57508fde3d238e80d4dec1174ee6515cce2dae.tar.bz2
mitmproxy-9c57508fde3d238e80d4dec1174ee6515cce2dae.zip
console: extract "enter" to m_select
Regularise, kill dead code, remove keybindings now not needed.
Diffstat (limited to 'mitmproxy/tools/console/grideditor')
-rw-r--r--mitmproxy/tools/console/grideditor/base.py2
-rw-r--r--mitmproxy/tools/console/grideditor/col_bytes.py2
-rw-r--r--mitmproxy/tools/console/grideditor/col_subgrid.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/mitmproxy/tools/console/grideditor/base.py b/mitmproxy/tools/console/grideditor/base.py
index bac574c4..cdda3def 100644
--- a/mitmproxy/tools/console/grideditor/base.py
+++ b/mitmproxy/tools/console/grideditor/base.py
@@ -6,7 +6,6 @@ import urwid
from mitmproxy.utils import strutils
from mitmproxy import exceptions
-from mitmproxy.tools.console import common
from mitmproxy.tools.console import signals
from mitmproxy.tools.console import layoutwidget
import mitmproxy.tools.console.master # noqa
@@ -252,7 +251,6 @@ class GridListBox(urwid.ListBox):
FIRST_WIDTH_MAX = 40
-FIRST_WIDTH_MIN = 20
class BaseGridEditor(urwid.WidgetWrap):
diff --git a/mitmproxy/tools/console/grideditor/col_bytes.py b/mitmproxy/tools/console/grideditor/col_bytes.py
index 227eb525..da10cbaf 100644
--- a/mitmproxy/tools/console/grideditor/col_bytes.py
+++ b/mitmproxy/tools/console/grideditor/col_bytes.py
@@ -15,7 +15,7 @@ class Column(base.Column):
return b""
def keypress(self, key, editor):
- if key in ["enter"]:
+ if key in ["m_select"]:
editor.walker.start_edit()
else:
return key
diff --git a/mitmproxy/tools/console/grideditor/col_subgrid.py b/mitmproxy/tools/console/grideditor/col_subgrid.py
index 4db37462..95995cd2 100644
--- a/mitmproxy/tools/console/grideditor/col_subgrid.py
+++ b/mitmproxy/tools/console/grideditor/col_subgrid.py
@@ -26,7 +26,7 @@ class Column(base.Column):
expire=1000
)
return
- elif key in ["enter"]:
+ elif key == "m_select":
editor.master.view_grideditor(
self.subeditor(
editor.master,