# HG changeset patch # User Durham Goode # Date 2016-02-10 20:39:25 # Node ID c4bec3c45ec9fe292965be3867b28db691ede818 # Parent c3e9269d96027670b79a4c4ffc02a3320c00e846 revsetbenchmark: handle exception case If the revset being benchmarked has an exception, the handling code was encountering an error because the exception did not always have an "output" attribute (I think it's a python 2.7 thing). diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py --- a/contrib/revsetbenchmarks.py +++ b/contrib/revsetbenchmarks.py @@ -63,7 +63,7 @@ def perf(revset, target=None, contexts=F return parseoutput(output) except CalledProcessError as exc: print >> sys.stderr, 'abort: cannot run revset benchmark: %s' % exc.cmd - if exc.output is None: + if getattr(exc, 'output', None) is None: # no output before 2.7 print >> sys.stderr, '(no output)' else: print >> sys.stderr, exc.output