aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/log.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-15 23:17:57 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-15 23:17:57 -0700
commit3602fd7a36d963311339ab11ed36ff00df860f71 (patch)
tree5834a98b35c02639c876544bc645f205068fac99 /pathod/log.py
parenta3c7c84d49c3e6563e7f37ef60c989f99ed96788 (diff)
parent17305643bc482c0b185eec5c64d506790cd26587 (diff)
downloadmitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.gz
mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.bz2
mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.zip
Merge remote-tracking branch 'origin/master' into message-body-encoding
Diffstat (limited to 'pathod/log.py')
-rw-r--r--pathod/log.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/pathod/log.py b/pathod/log.py
index 1d3ec356..47837101 100644
--- a/pathod/log.py
+++ b/pathod/log.py
@@ -62,7 +62,14 @@ class LogCtx(object):
for line in strutils.hexdump(data):
self("\t%s %s %s" % line)
else:
- for i in strutils.clean_bin(data).split("\n"):
+ data = strutils.native(
+ strutils.escape_control_characters(
+ data
+ .decode("ascii", "replace")
+ .replace(u"\ufffd", u".")
+ )
+ )
+ for i in data.split("\n"):
self("\t%s" % i)
def __call__(self, line):