aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 02:03:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 02:03:13 +0000
commitf1eebbe3aa15d420d4a8e1c0288a14c38127a256 (patch)
treeeccd856cf9dee9b45117b34bffda706f5620e1b6
parent7551c55bd6f5d6ecdfeaf8053d352d17acfb7422 (diff)
parentd5a8f8a93ed662d830cd4cc57ef14d05838f6897 (diff)
downloadexternal_llvm-f1eebbe3aa15d420d4a8e1c0288a14c38127a256.zip
external_llvm-f1eebbe3aa15d420d4a8e1c0288a14c38127a256.tar.gz
external_llvm-f1eebbe3aa15d420d4a8e1c0288a14c38127a256.tar.bz2
am d5a8f8a9: am d74cfd3c: Merge "Now that we require a newer python, use the new exception syntax."
* commit 'd5a8f8a93ed662d830cd4cc57ef14d05838f6897': Now that we require a newer python, use the new exception syntax.
-rw-r--r--utils/lit/lit/TestRunner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index b331d19..6688029 100644
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -153,7 +153,7 @@ def executeShCmd(cmd, cfg, cwd, results):
stderr = stderr,
env = cfg.environment,
close_fds = kUseCloseFDs))
- except OSError, e:
+ except OSError as e:
raise InternalShellError(j, 'Could not create process due to {}'.format(e))
# Immediately close stdin for any process taking stdin from us.