Bug 816103 - Part a: Handle encodings explicitly in parseFailures.py; r=jhammel

dom/imptests/parseFailures.py

@@ -15,6 +15,7 @@ def extractLines(fp):
     lines = []
     watch = False
     for line in fp:
+        line = line.decode('utf-8')
         if line == '@@@ @@@ Failures\n':
             watch = True
         elif watch:
@@ -44,9 +45,10 @@ def dumpFailures(lines):
         files.append(jsonpath)
         ensuredir(jsonpath)
         obj = json.loads(objstr, object_pairs_hook=collections.OrderedDict)
-        formattedobj = json.dumps(obj, indent=2, separators=(',', sep))
-        fp = open(jsonpath, 'w')
-        fp.write(formattedobj + '\n')
+        formattedobjstr = json.dumps(obj, indent=2, separators=(',', sep)) + '\n'
+        formattedobj = formattedobjstr.encode('utf-8')
+        fp = open(jsonpath, 'wb')
+        fp.write(formattedobj)
         fp.close()
     return files
 
@@ -57,14 +59,15 @@ def writeMakefiles(files):
         pathmap.setdefault(dirp, []).append(leaf)
 
     for k, v in pathmap.items():
-        result = writeMakefile.substMakefile('parseFailures.py', [], v)
+        resultstr = writeMakefile.substMakefile('parseFailures.py', [], v)
+        result = resultstr.encode('utf-8')
 
-        fp = open(k + '/Makefile.in', 'w')
+        fp = open(k + '/Makefile.in', 'wb')
         fp.write(result)
         fp.close()
 
 def main(logPath):
-    fp = open(logPath, 'r')
+    fp = open(logPath, 'rb')
     lines = extractLines(fp)
     fp.close()