Merge last PGO-green changeset of mozilla-inbound to mozilla-central

This commit is contained in:
Phil Ringnalda 2012-10-07 18:31:44 -07:00
commit c3324f9fe1

View File

@ -314,7 +314,7 @@ class MozbuildObject(object):
def handleLine(line):
# Converts str to unicode on Python 2 and bytes to str on Python 3.
if isinstance(line, bytes):
line = line.decode(sys.stdout.encoding)
line = line.decode(sys.stdout.encoding or 'utf-8', 'replace')
if line_handler:
line_handler(line)