Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/build/RunCbindgen.py b/build/RunCbindgen.py
index e166556f68..fbbe9d0584 100644
--- a/build/RunCbindgen.py
+++ b/build/RunCbindgen.py
@@ -7,7 +7,6 @@ import subprocess
 
 import buildconfig
 import mozpack.path as mozpath
-import six
 import toml
 
 
@@ -29,11 +28,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)
+    p = subprocess.Popen(
+        args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding="utf-8"
+    )
 
     stdout, stderr = p.communicate()
-    stdout = six.ensure_text(stdout)
-    stderr = six.ensure_text(stderr)
     if p.returncode != 0:
         print(stdout)
         print(stderr)
@@ -63,7 +62,8 @@ def generate_metadata(output, cargo_config):
     if returncode != 0:
         return returncode
 
-    output.write(stdout)
+    if stdout:
+        output.write(stdout)
 
     # This is not quite accurate, but cbindgen only cares about a subset of the
     # data which, when changed, causes these files to change.
@@ -88,7 +88,8 @@ def generate(output, metadata_path, cbindgen_crate_path, *in_tree_dependencies):
     if returncode != 0:
         return returncode
 
-    output.write(stdout)
+    if stdout:
+        output.write(stdout)
 
     deps = set()
     deps.add(CARGO_LOCK)