[PATCH] perf flamegraph: explicitly set utf-8 encoding

From: Andreas Gerstmayr
Date: Fri Jun 19 2020 - 09:09:14 EST


on some platforms the default encoding is not utf-8,
which causes an UnicodeDecodeError when reading the flamegraph template

Signed-off-by: Andreas Gerstmayr <agerstmayr@xxxxxxxxxx>
---
Tested with Python 2.7 and 3.

tools/perf/scripts/python/flamegraph.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/scripts/python/flamegraph.py b/tools/perf/scripts/python/flamegraph.py
index 61f3be9add6b..8979db910a8f 100755
--- a/tools/perf/scripts/python/flamegraph.py
+++ b/tools/perf/scripts/python/flamegraph.py
@@ -17,6 +17,7 @@
from __future__ import print_function
import sys
import os
+import io
import argparse
import json

@@ -81,7 +82,7 @@ class FlameGraphCLI:

if self.args.format == "html":
try:
- with open(self.args.template) as f:
+ with io.open(self.args.template, encoding="utf-8") as f:
output_str = f.read().replace("/** @flamegraph_json **/",
json_str)
except IOError as e:
@@ -97,7 +98,7 @@ class FlameGraphCLI:
else:
print("dumping data to {}".format(output_fn))
try:
- with open(output_fn, "w") as out:
+ with io.open(output_fn, "w", encoding="utf-8") as out:
out.write(output_str)
except IOError as e:
print("Error writing output file: {}".format(e), file=sys.stderr)
--
2.25.4