tools: Fix bytes<->str mixing in python3

ego · Mar 16, 2022 · 55dcd2e · 55dcd2e
1 parent b2e363d
commit 55dcd2e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tools/btrfsdist.py b/tools/btrfsdist.py
@@ -231,7 +231,7 @@
  if args.interval and (not args.notimestamp):
  print(strftime("%H:%M:%S:"))
 
- dist.print_log2_hist(label, "operation")
+ dist.print_log2_hist(label, "operation", section_print_fn=bytes.decode)
  dist.clear()
 
  countdown -= 1

diff --git a/tools/hardirqs.py b/tools/hardirqs.py
@@ -241,7 +241,7 @@
  print("%-8s\n" % strftime("%H:%M:%S"), end="")
 
  if args.dist:
- dist.print_log2_hist(label, "hardirq")
+ dist.print_log2_hist(label, "hardirq", section_print_fn=bytes.decode)
  else:
  print("%-26s %11s" % ("HARDIRQ", "TOTAL_" + label))
  for k, v in sorted(dist.items(), key=lambda dist: dist[1].value):

diff --git a/tools/xfsdist.py b/tools/xfsdist.py
@@ -169,7 +169,7 @@
  if args.interval and (not args.notimestamp):
  print(strftime("%H:%M:%S:"))
 
- dist.print_log2_hist(label, "operation")
+ dist.print_log2_hist(label, "operation", section_print_fn=bytes.decode)
  dist.clear()
 
  countdown -= 1

diff --git a/tools/zfsdist.py b/tools/zfsdist.py
@@ -183,7 +183,7 @@
  if args.interval and (not args.notimestamp):
  print(strftime("%H:%M:%S:"))
 
- dist.print_log2_hist(label, "operation")
+ dist.print_log2_hist(label, "operation", section_print_fn=bytes.decode)
  dist.clear()
 
  countdown -= 1