From 44d0ad77678d8496755ba5f82846f50c79462d90 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 7 Aug 2013 03:15:10 +0000 Subject: [PATCH] [lit] Use more modern syntax for constructing exceptions. llvm-svn: 187853 --- utils/lit/lit/ShCommands.py | 6 +++--- utils/lit/lit/ShUtil.py | 15 +++++++++------ utils/lit/lit/TestRunner.py | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/utils/lit/lit/ShCommands.py b/utils/lit/lit/ShCommands.py index 4550437ce22..7e5812165c0 100644 --- a/utils/lit/lit/ShCommands.py +++ b/utils/lit/lit/ShCommands.py @@ -20,14 +20,14 @@ class Command: elif '"' not in arg and '$' not in arg: quoted = '"%s"' % arg else: - raise NotImplementedError,'Unable to quote %r' % arg + raise NotImplementedError('Unable to quote %r' % arg) print >>file, quoted, # For debugging / validation. import ShUtil dequoted = list(ShUtil.ShLexer(quoted).lex()) if dequoted != [arg]: - raise NotImplementedError,'Unable to quote %r' % arg + raise NotImplementedError('Unable to quote %r' % arg) for r in self.redirects: if len(r[0]) == 1: @@ -54,7 +54,7 @@ class Pipeline: def toShell(self, file, pipefail=False): if pipefail != self.pipe_err: - raise ValueError,'Inconsistent "pipefail" attribute!' + raise ValueError('Inconsistent "pipefail" attribute!') if self.negate: print >>file, '!', for cmd in self.commands: diff --git a/utils/lit/lit/ShUtil.py b/utils/lit/lit/ShUtil.py index 00bb40255c9..8a292f46cc8 100644 --- a/utils/lit/lit/ShUtil.py +++ b/utils/lit/lit/ShUtil.py @@ -116,9 +116,11 @@ class ShLexer: reference = self.lex_arg_slow(c) if res is not None: if res != reference: - raise ValueError,"Fast path failure: %r != %r" % (res, reference) + raise ValueError("Fast path failure: %r != %r" % ( + res, reference)) if self.pos != end: - raise ValueError,"Fast path failure: %r != %r" % (self.pos, end) + raise ValueError("Fast path failure: %r != %r" % ( + self.pos, end)) return reference def lex_arg(self, c): @@ -186,9 +188,9 @@ class ShParser: def parse_command(self): tok = self.lex() if not tok: - raise ValueError,"empty command!" + raise ValueError("empty command!") if isinstance(tok, tuple): - raise ValueError,"syntax error near unexpected token %r" % tok[0] + raise ValueError("syntax error near unexpected token %r" % tok[0]) args = [tok] redirects = [] @@ -213,7 +215,7 @@ class ShParser: op = self.lex() arg = self.lex() if not arg: - raise ValueError,"syntax error near token %r" % op[0] + raise ValueError("syntax error near token %r" % op[0]) redirects.append((op, arg)) return Command(args, redirects) @@ -235,7 +237,8 @@ class ShParser: assert isinstance(operator, tuple) and len(operator) == 1 if not self.look(): - raise ValueError, "missing argument to operator %r" % operator[0] + raise ValueError( + "missing argument to operator %r" % operator[0]) # FIXME: Operator precedence!! lhs = Seq(lhs, operator[0], self.parse_pipeline()) diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index d9046161276..548f6f532bc 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -66,7 +66,7 @@ def executeShCmd(cmd, cfg, cwd, results): res = executeShCmd(cmd.rhs, cfg, cwd, results) return res - raise ValueError,'Unknown shell command: %r' % cmd.op + raise ValueError('Unknown shell command: %r' % cmd.op) assert isinstance(cmd, ShUtil.Pipeline) procs = []