aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 01:56:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 01:56:36 +0000
commitd5a8f8a93ed662d830cd4cc57ef14d05838f6897 (patch)
treeeccd856cf9dee9b45117b34bffda706f5620e1b6
parentb78e4661de92772bbe09e1f4bd8da54ee41f64e8 (diff)
parentd74cfd3c1f507ab51b576e0d2ce80dc8906c2e8e (diff)
downloadexternal_llvm-d5a8f8a93ed662d830cd4cc57ef14d05838f6897.zip
external_llvm-d5a8f8a93ed662d830cd4cc57ef14d05838f6897.tar.gz
external_llvm-d5a8f8a93ed662d830cd4cc57ef14d05838f6897.tar.bz2
am d74cfd3c: Merge "Now that we require a newer python, use the new exception syntax."
* commit 'd74cfd3c1f507ab51b576e0d2ce80dc8906c2e8e': 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.