Merge pull request #969 from xutian/fix_unicode

virttest.utils_misc: fix unicode decode errors
avocado-framework · Mar 31, 2017 · 8355da4 · 8355da4
2 parents 8725e4d + 9043d26
commit 8355da4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/virttest/utils_misc.py b/virttest/utils_misc.py
@@ -477,10 +477,9 @@ def log_line(filename, line):
                 pass
             _open_log_files[base_file] = open(log_file, "w")
         timestr = time.strftime("%Y-%m-%d %H:%M:%S")
-        _open_log_files[base_file].write("%s: %s\n"
-                                         % (timestr,
-                                            line.encode(ENCODING,
-                                                        'ignore')))
+        line = unicode("%s: %s" % (timestr, line), errors="ignore")
+        line = line.encode(ENCODING, errors='ignore')
+        _open_log_files[base_file].write("%s\n" % line)
         _open_log_files[base_file].flush()
     finally:
         _log_lock.release()