Merge pull request #32589 from compnerd/cartography

test: make `gen-output-file-map` Python 3 friendly

Author: compnerd

test/Incremental/Verifier/gen-output-file-map.py

@@ -3,6 +3,7 @@
 from __future__ import print_function
 
 import argparse
+import io
 import json
 import os
 import sys
@@ -61,13 +62,22 @@ def main(arguments):
         'swift-dependencies': './main-buildrecord.swiftdeps'
     }
 
-    with open(output_path, 'wb') as f:
-        json.dump(all_records, f)
+    # TODO: this is for python 2 and python 3 compatibility.  Once Python 2 is
+    # removed, this function can be removed.
+    def to_unicode(r):
+        import sys
+        if sys.version_info[0] < 3:
+            return unicode(r)
+        return str(r)
+
+    with io.open(output_path, 'w', encoding='utf-8', newline='\n') as f:
+        f.write(to_unicode(json.dumps(all_records, ensure_ascii=False)))
 
     if args.response_output_file is not None:
-        with open(args.response_output_file, 'wb') as f:
+        with io.open(args.response_output_file, 'w',
+                     encoding='utf-8', newline='\n') as f:
             for line in response_file_contents:
-                f.write(line + " ")
+                f.write(to_unicode(line + " "))
 
 
 if __name__ == '__main__':