diff options
| author | Jon Severinsson <jon@severinsson.net> | 2013-04-13 01:39:45 +0200 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-04-16 21:05:05 -0700 |
| commit | 51224e010d755258fe079bf11f8eb1423408bd40 (patch) | |
| tree | 5311cd98b859331e97a35a05e71c288116713b64 | |
| parent | 4dd720218003bfccc13d30e3e77baf29dc563146 (diff) | |
framework: Consistently use Python 2.2+ syntax for dictionary key checks.
The old syntax is no longer supported in Python 3.x.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | framework/exectest.py | 2 | ||||
| -rw-r--r-- | framework/summary.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/exectest.py b/framework/exectest.py index b8d97b83..a8ed8614 100644 --- a/framework/exectest.py +++ b/framework/exectest.py @@ -224,7 +224,7 @@ class PlainExecTest(ExecTest): try: for piglit in outpiglit: if piglit.startswith('subtest'): - if not results.has_key('subtest'): + if not 'subtest' in results: results['subtest'] = {} results['subtest'].update(eval(piglit[7:])) else: diff --git a/framework/summary.py b/framework/summary.py index 91e08707..a72bb4b9 100644 --- a/framework/summary.py +++ b/framework/summary.py @@ -162,7 +162,7 @@ results is an array of GroupResult instances, one per testrun # result 1: # test/group PASS for r in self.results: - if r.has_key(name) and not isinstance(r[name], core.GroupResult): + if name in r and not isinstance(r[name], core.GroupResult): self.createDummyGroup(r, name) childresults = [r.get(name, core.GroupResult()) @@ -185,11 +185,11 @@ results is an array of GroupResult instances, one per testrun # test/group/c PASS need_group = 0 for r in self.results: - if r.has_key(name) and not isinstance(r[name], core.TestResult): + if name in r and not isinstance(r[name], core.TestResult): need_group = 1 if need_group: for r in self.results: - if r.has_key(name) and isinstance(r[name], core.TestResult): + if name in r and isinstance(r[name], core.TestResult): self.createDummyGroup(r, name) childresults = [r.get(name, core.GroupResult()) for r in self.results] |