Fix unicode logs

Author: DanLipsitt

openhtf/core/test_state.py

@@ -222,7 +222,7 @@ def finalize_from_phase_outcome(self, phase_execution_outcome):
       result = phase_execution_outcome.phase_result
       if isinstance(result, phase_executor.ExceptionInfo):
         code = result.exc_type.__name__
-        description = str(result.exc_val).decode('utf8', 'replace')
+        description = unicode(result.exc_val)
       else:
         # openhtf.util.threads.ThreadTerminationError gets str'd directly.
         code = str(type(phase_execution_outcome.phase_result).__name__)

openhtf/util/logs.py

@@ -178,9 +178,8 @@ def emit(self, record):
     """
     message = record.getMessage()
     if record.exc_info:
-      message += '\n' + ''.join(traceback.format_exception(
+      message += u'\n' + u''.join(traceback.format_exception(
           *record.exc_info))
-    message = message.decode('utf8', 'replace')
 
     log_record = LogRecord(
         record.levelno, record.name, os.path.basename(record.pathname),

test/util/data_test.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 # Copyright 2016 Google Inc. All Rights Reserved.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +30,7 @@ class FloatSubclass(float):
       'list': [10],
       'tuple': (10,),
       'str': '10',
-      'unicode': u'10',
+      'unicode': u'☃',
       'int': 2 ** 40,
       'float': 10.0,
       'long': 2 ** 80,
@@ -43,6 +45,7 @@ class FloatSubclass(float):
     self.assertIs(type(converted['tuple']), tuple)
     self.assertIs(type(converted['str']), str)
     self.assertIs(type(converted['unicode']), unicode)
+    self.assertEqual(converted['unicode'], example_data['unicode'])
     self.assertIs(type(converted['int']), int)
     self.assertIs(type(converted['float']), float)
     self.assertIs(type(converted['long']), long)