aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/log.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-05 16:02:37 -0700
committerGitHub <noreply@github.com>2016-07-05 16:02:37 -0700
commite84f5fcc7224d5cbbf3cf77eadfcd3aeb71fc7db (patch)
tree0caa50719bb854ea6ddfce3ee4089a4267861fb5 /pathod/log.py
parent09d678272245dd12efe91ecadbe0b2731f4306b1 (diff)
parentd51cf543bb74755ed5dd17ed02859912ec557ef4 (diff)
downloadmitmproxy-e84f5fcc7224d5cbbf3cf77eadfcd3aeb71fc7db.tar.gz
mitmproxy-e84f5fcc7224d5cbbf3cf77eadfcd3aeb71fc7db.tar.bz2
mitmproxy-e84f5fcc7224d5cbbf3cf77eadfcd3aeb71fc7db.zip
Merge pull request #1315 from mitmproxy/better-unicode-handling
remove clean_bin, clarify unicode handling
Diffstat (limited to 'pathod/log.py')
-rw-r--r--pathod/log.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pathod/log.py b/pathod/log.py
index 1d3ec356..d39496e0 100644
--- a/pathod/log.py
+++ b/pathod/log.py
@@ -62,8 +62,9 @@ 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"):
- self("\t%s" % i)
+ data = data.decode("ascii", "replace").replace(u"\ufffd", u".")
+ for i in strutils.escape_control_characters(data).split(u"\n"):
+ self(u"\t%s" % i)
def __call__(self, line):
self.lines.append(line)