Bug 1642044 - Python 3 tools/rb/fix_stacks.py r=gbrown
authorBob Clary <bclary@bclary.com>
Mon, 01 Jun 2020 23:14:05 +0000
changeset 597601 f965f78cedf7567b0dabff11c6edbf0fd485b3b0
parent 597600 2da7ae90fbf021486111eed08a36e361cdaab3a0
child 597602 c3799309b95c400ddfdb1f24f630d4c5dcba6fc6
push id13310
push userffxbld-merge
push dateMon, 29 Jun 2020 14:50:06 +0000
treeherdermozilla-beta@15a59a0afa5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1642044
milestone79.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1642044 - Python 3 tools/rb/fix_stacks.py r=gbrown Depends on D77660 Differential Revision: https://phabricator.services.mozilla.com/D77661
tools/rb/fix_stacks.py
--- a/tools/rb/fix_stacks.py
+++ b/tools/rb/fix_stacks.py
@@ -10,26 +10,29 @@
 from __future__ import absolute_import, print_function
 from subprocess import Popen, PIPE
 import atexit
 import os
 import platform
 import re
 import sys
 
+import six
+
 # Matches lines produced by MozFormatCodeAddress(), e.g.
 # `#01: ???[tests/example +0x43a0]`.
 line_re = re.compile("#\d+: .+\[.+ \+0x[0-9A-Fa-f]+\]")
 
 fix_stacks = None
 
 
 def fixSymbols(line, jsonMode=False, slowWarning=False, breakpadSymsDir=None, hide_errors=False):
     global fix_stacks
 
+    line = six.ensure_str(line)
     result = line_re.search(line)
     if result is None:
         return line
 
     if not fix_stacks:
         # Look in MOZ_FETCHES_DIR (for automation), then in MOZBUILD_STATE_PATH
         # (for a local build where the user has that set), then in ~/.mozbuild
         # (for a local build with default settings).