From b1ef4bce305c284635c241cc8cf5cf86262730cb Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 19 Mar 2017 13:02:51 +1300 Subject: options: filter -> view_filter --- mitmproxy/options.py | 4 ++-- mitmproxy/tools/console/flowlist.py | 4 ++-- mitmproxy/tools/console/statusbar.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mitmproxy/options.py b/mitmproxy/options.py index 9232378f..31d0b693 100644 --- a/mitmproxy/options.py +++ b/mitmproxy/options.py @@ -396,8 +396,8 @@ class Options(optmanager.OptManager): ) self.add_option( - "filter", Optional[str], None, - "Filter view expression." + "view_filter", Optional[str], None, + "Limit which flows are displayed." ) # Web options diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py index 5fe86975..04052ec8 100644 --- a/mitmproxy/tools/console/flowlist.py +++ b/mitmproxy/tools/console/flowlist.py @@ -366,8 +366,8 @@ class FlowListBox(urwid.ListBox): elif key == "f": signals.status_prompt.send( prompt = "Filter View", - text = self.master.options.filter, - callback = self.master.options.setter("filter") + text = self.master.options.view_filter, + callback = self.master.options.setter("view_filter") ) elif key == "L": signals.status_prompt_path.send( diff --git a/mitmproxy/tools/console/statusbar.py b/mitmproxy/tools/console/statusbar.py index 3f18bbb3..37074dc2 100644 --- a/mitmproxy/tools/console/statusbar.py +++ b/mitmproxy/tools/console/statusbar.py @@ -191,10 +191,10 @@ class StatusBar(urwid.WidgetWrap): r.append("[") r.append(("heading_key", "i")) r.append(":%s]" % self.master.options.intercept) - if self.master.options.filter: + if self.master.options.view_filter: r.append("[") r.append(("heading_key", "f")) - r.append(":%s]" % self.master.options.filter) + r.append(":%s]" % self.master.options.view_filter) if self.master.options.stickycookie: r.append("[") r.append(("heading_key", "t")) -- cgit v1.2.3