From d51cf543bb74755ed5dd17ed02859912ec557ef4 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 5 Jul 2016 15:11:32 -0700 Subject: remove clean_bin, clarify unicode handling --- pathod/log.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pathod/log.py') 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) -- cgit v1.2.3 From 8b564bc934b8b51734c41192ecb0135c264087cc Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 6 Jul 2016 16:47:32 -0700 Subject: fix pathod log encoding --- pathod/log.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pathod/log.py') diff --git a/pathod/log.py b/pathod/log.py index d39496e0..47837101 100644 --- a/pathod/log.py +++ b/pathod/log.py @@ -62,9 +62,15 @@ class LogCtx(object): for line in strutils.hexdump(data): self("\t%s %s %s" % line) else: - 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) + 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): self.lines.append(line) -- cgit v1.2.3