aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2017-03-19 13:02:51 +1300
committerAldo Cortesi <aldo@corte.si>2017-03-19 13:02:51 +1300
commitb1ef4bce305c284635c241cc8cf5cf86262730cb (patch)
treeb3d336545d416e8d628e27fbad80a7c7d1a63678
parent1b330ba453f9829c300a65d6eb2110cfb71728f4 (diff)
downloadmitmproxy-b1ef4bce305c284635c241cc8cf5cf86262730cb.tar.gz
mitmproxy-b1ef4bce305c284635c241cc8cf5cf86262730cb.tar.bz2
mitmproxy-b1ef4bce305c284635c241cc8cf5cf86262730cb.zip
options: filter -> view_filter
-rw-r--r--mitmproxy/options.py4
-rw-r--r--mitmproxy/tools/console/flowlist.py4
-rw-r--r--mitmproxy/tools/console/statusbar.py4
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"))