aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-03-31 18:07:58 +0200
committerMaximilian Hils <git@maximilianhils.com>2016-03-31 18:07:58 +0200
commitc788e18e03e22bccb7c08eb7ac8283f3732aa50d (patch)
tree6cd4f99c6570a5c4e7f00a48f91cba147c5b4974 /mitmproxy/dump.py
parent5552b5e782deaa510ebb00f337e39e99ac452aae (diff)
parentde0f2cbcd349005a07679283befa2d209bd9d022 (diff)
downloadmitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.gz
mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.bz2
mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 7b4609b4..631e4d2e 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -5,7 +5,6 @@ import click
import itertools
from netlib import tcp
-from netlib.http import CONTENT_MISSING
import netlib.utils
from . import flow, filt, contentviews
from .exceptions import ContentViewException
@@ -180,7 +179,7 @@ class DumpMaster(flow.FlowMaster):
)
self.echo(headers, indent=4)
if self.o.flow_detail >= 3:
- if message.content == CONTENT_MISSING:
+ if message.content is None:
self.echo("(content missing)", indent=4)
elif message.content:
self.echo("")
@@ -283,7 +282,7 @@ class DumpMaster(flow.FlowMaster):
code = click.style(str(code), fg=code_color, bold=True, blink=(code == 418))
reason = click.style(flow.response.reason, fg=code_color, bold=True)
- if flow.response.content == CONTENT_MISSING:
+ if flow.response.content is None:
size = "(content missing)"
else:
size = netlib.utils.pretty_size(len(flow.response.content))