aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShadab Zafar <dufferzafar0@gmail.com>2016-07-10 20:31:32 +0530
committerShadab Zafar <dufferzafar0@gmail.com>2016-07-20 10:03:00 +0530
commite56df1b7062f10c665e5ab42e7301ed2865336fa (patch)
tree4dc2961f7dcaa428526e061755c2ee193161c427
parent5377d5a61dfdad9790c7b64118622c40ad405e73 (diff)
downloadmitmproxy-e56df1b7062f10c665e5ab42e7301ed2865336fa.tar.gz
mitmproxy-e56df1b7062f10c665e5ab42e7301ed2865336fa.tar.bz2
mitmproxy-e56df1b7062f10c665e5ab42e7301ed2865336fa.zip
Don't send master and state parameters
-rw-r--r--mitmproxy/console/common.py14
-rw-r--r--mitmproxy/console/flowlist.py2
2 files changed, 8 insertions, 8 deletions
diff --git a/mitmproxy/console/common.py b/mitmproxy/console/common.py
index 03343914..f5838822 100644
--- a/mitmproxy/console/common.py
+++ b/mitmproxy/console/common.py
@@ -232,7 +232,7 @@ def flow_format_data(part, scope, flow):
return data, False
-def copy_flow(part, scope, flow, master, state):
+def copy_flow(part, scope, flow):
"""
part: _c_ontent, _h_eaders+content, _u_rl
scope: _a_ll, re_q_uest, re_s_ponse
@@ -255,7 +255,7 @@ def copy_flow(part, scope, flow, master, state):
copy_to_clipboard_or_prompt(data)
-def ask_copy_part(scope, flow, master, state):
+def ask_copy_part(scope, flow):
choices = [
("content", "c"),
("headers+content", "h")
@@ -267,11 +267,11 @@ def ask_copy_part(scope, flow, master, state):
prompt = "Copy",
keys = choices,
callback = copy_flow,
- args = (scope, flow, master, state)
+ args = (scope, flow)
)
-def ask_save_body(part, master, state, flow):
+def ask_save_body(part, flow):
"""
Save either the request or the response body to disk.
@@ -292,12 +292,12 @@ def ask_save_body(part, master, state, flow):
("response", "s"),
),
callback = ask_save_body,
- args = (master, state, flow)
+ args = (flow)
)
elif response_has_content:
- ask_save_body("s", master, state, flow)
+ ask_save_body("s", flow)
else:
- ask_save_body("q", master, state, flow)
+ ask_save_body("q", flow)
elif part == "q" and request_has_content:
ask_save_path(
diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py
index 68d63938..f3e75ffa 100644
--- a/mitmproxy/console/flowlist.py
+++ b/mitmproxy/console/flowlist.py
@@ -281,7 +281,7 @@ class ConnectionItem(urwid.WidgetWrap):
args = (self.flow, common.copy_to_clipboard_or_prompt)
)
elif key == "b":
- common.ask_save_body(None, self.master, self.state, self.flow)
+ common.ask_save_body(None, self.flow)
else:
return key