diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-02-05 14:33:17 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-02-05 14:33:17 +0100 |
| commit | d864a326d25815a240aa5ac34171e48687311f29 (patch) | |
| tree | 8041cd128cc7a261687f696cdc33e4e6707e66d9 /libmproxy/console | |
| parent | 6a53ae5fd37b516074f9bf46cffab015f6626b9e (diff) | |
| download | mitmproxy-d864a326d25815a240aa5ac34171e48687311f29.tar.gz mitmproxy-d864a326d25815a240aa5ac34171e48687311f29.tar.bz2 mitmproxy-d864a326d25815a240aa5ac34171e48687311f29.zip | |
fix all tests except those using set_url and get_url
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/common.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/flowdetailview.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index a316602c..092990b1 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -1008,7 +1008,7 @@ class ConsoleMaster(flow.FlowMaster): self.statusbar.refresh_flow(c) def process_flow(self, f, r): - if self.state.intercept and f.match(self.state.intercept) and not f.request.is_replay(): + if self.state.intercept and f.match(self.state.intercept) and not f.request.is_replay: f.intercept() else: r.reply() diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index a94f7ae4..715bed80 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -172,7 +172,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): intercepting = f.intercepting, req_timestamp = f.request.timestamp_start, - req_is_replay = f.request.is_replay(), + req_is_replay = f.request.is_replay, req_method = f.request.method, req_acked = f.request.reply.acked, req_url = f.request.get_url(hostheader=hostheader), @@ -194,7 +194,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): d.update(dict( resp_code = f.response.code, - resp_is_replay = f.response.is_replay(), + resp_is_replay = f.response.is_replay, resp_acked = f.response.reply.acked, resp_clen = contentdesc, resp_rate = "{0}/s".format(rate), diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py index a26e5308..8392537e 100644 --- a/libmproxy/console/flowdetailview.py +++ b/libmproxy/console/flowdetailview.py @@ -74,9 +74,9 @@ class FlowDetailsView(urwid.ListBox): ) text.extend(common.format_keyvals(parts, key="key", val="text", indent=4)) - if self.flow.request.client_conn: + if self.flow.client_conn: text.append(urwid.Text([("head", "Client Connection:")])) - cc = self.flow.request.client_conn + cc = self.flow.client_conn parts = [ ["Address", "%s:%s"%tuple(cc.address)], ["Requests", "%s"%cc.requestcount], |