Backed out changeset fb52e6ee18c6 (bug 1714690) for causing bustages at complaining about charmap. CLOSED TREE

build/RunCbindgen.py

@@ -7,6 +7,7 @@ import subprocess
 
 import buildconfig
 import mozpack.path as mozpath
+import six
 import toml
 
 
@@ -28,11 +29,11 @@ def _run_process(args):
     env["CARGO"] = str(buildconfig.substs["CARGO"])
     env["RUSTC"] = str(buildconfig.substs["RUSTC"])
 
-    p = subprocess.Popen(
-        args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
-    )
+    p = subprocess.Popen(args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     stdout, stderr = p.communicate()
+    stdout = six.ensure_text(stdout)
+    stderr = six.ensure_text(stderr)
     if p.returncode != 0:
         print(stdout)
         print(stderr)