From d6d20ed14cbbfe0ccad71af844e4c0b8a30d6b84 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 4 Jun 2014 16:04:14 -0400 Subject: [PATCH] Backed out changeset 12536416d070 (bug 991866) for breaking B2G mochitests. CLOSED TREE --- .../mozbase/mozprocess/mozprocess/processhandler.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testing/mozbase/mozprocess/mozprocess/processhandler.py b/testing/mozbase/mozprocess/mozprocess/processhandler.py index 7b840228c142..56fda7efbbdd 100644 --- a/testing/mozbase/mozprocess/mozprocess/processhandler.py +++ b/testing/mozbase/mozprocess/mozprocess/processhandler.py @@ -908,24 +908,14 @@ class StoreOutput(object): class StreamOutput(object): """pass output to a stream and flush""" - encodings = ['utf-8', 'iso8859-1'] def __init__(self, stream): self.stream = stream def __call__(self, line): - self.stream.write(self.decode(line) + '\n') + self.stream.write(line + '\n') self.stream.flush() - def decode(self, line): - exc_info = None - for encoding in self.encodings: - try: - return line.decode(encoding, 'replace') - except UnicodeDecodeError: - exc_info = sys.exc_info() - raise exc_info[0], exc_info[1], exc_info[2] - class LogOutput(StreamOutput): """pass output to a file"""