aboutsummaryrefslogtreecommitdiffstats
path: root/yardstick/common
diff options
context:
space:
mode:
authorJo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-13 16:19:58 +0100
committerJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-13 16:48:17 +0000
commitad3ec6ae195e9cda3af316d5cc47de0e948abe4c (patch)
treebdac6e82f26150f153be3ed0f699b60e62094a5d /yardstick/common
parentfed1e1f6b8508e5a055576583adc0fe1d646fd73 (diff)
Fix flake8 errors
Change-Id: I14f21092f5e97abf0629a92a27062846a6d3130b JIRA:- Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> (cherry picked from commit 791323df72d8bf4f4f4c32a1e7273721f2adc349)
Diffstat (limited to 'yardstick/common')
-rw-r--r--yardstick/common/template_format.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/yardstick/common/template_format.py b/yardstick/common/template_format.py
index 881b7e45b..2deaf393c 100644
--- a/yardstick/common/template_format.py
+++ b/yardstick/common/template_format.py
@@ -56,8 +56,8 @@ def parse(tmpl_str):
if tpl is None:
tpl = {}
# Looking for supported version keys in the loaded template
- if not ('HeatTemplateFormatVersion' in tpl
- or 'heat_template_version' in tpl
- or 'AWSTemplateFormatVersion' in tpl):
+ if not ('HeatTemplateFormatVersion' in tpl or
+ 'heat_template_version' in tpl or
+ 'AWSTemplateFormatVersion' in tpl):
raise ValueError("Template format version not found.")
return tpl