From a4f983e258cbd901918f0b2ac45bb73b67d1b498 Mon Sep 17 00:00:00 2001
From: "Michael J. Spencer" <bigcheesegs@gmail.com>
Date: Wed, 26 Mar 2014 00:53:48 +0000
Subject: [PATCH] [lit] Python 3.

llvm-svn: 204773
---
 lld/test/Unit/lit.site.cfg.in | 2 +-
 lld/test/lit.cfg              | 7 ++++---
 lld/test/lit.site.cfg.in      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lld/test/Unit/lit.site.cfg.in b/lld/test/Unit/lit.site.cfg.in
index e482e760d71b..74c5eca91153 100644
--- a/lld/test/Unit/lit.site.cfg.in
+++ b/lld/test/Unit/lit.site.cfg.in
@@ -17,7 +17,7 @@ try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
     config.llvm_build_mode = config.llvm_build_mode % lit_config.params
-except KeyError,e:
+except KeyError as e:
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg
index b2f7170faa36..c66b6ac82995 100644
--- a/lld/test/lit.cfg
+++ b/lld/test/lit.cfg
@@ -4,6 +4,7 @@ import os
 import platform
 import re
 import subprocess
+import locale
 
 import lit.formats
 import lit.util
@@ -131,11 +132,11 @@ try:
      subprocess.Popen([os.path.join(llvm_tools_dir, 'llvm-config'),
                      '--build-mode', '--assertion-mode'],
                       stdout = subprocess.PIPE)
-except OSError, why:
-    print "Could not find llvm-config in " + llvm_tools_dir
+except OSError as why:
+    print("Could not find llvm-config in " + llvm_tools_dir)
     exit(42)
 
-llvm_config_output = llvm_config_cmd.stdout.read()
+llvm_config_output = llvm_config_cmd.stdout.read().decode(locale.getdefaultlocale()[1])
 llvm_config_output_list = llvm_config_output.split("\n")
 
 if re.search(r'DEBUG', llvm_config_output_list[0]):
diff --git a/lld/test/lit.site.cfg.in b/lld/test/lit.site.cfg.in
index 8d70a4af3314..0eeb889d1b20 100644
--- a/lld/test/lit.site.cfg.in
+++ b/lld/test/lit.site.cfg.in
@@ -14,7 +14,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@"
 try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
-except KeyError,e:
+except KeyError as e:
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))