summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
diff options
context:
space:
mode:
authorShang Xiaodong <shang.xiaodong@zte.com.cn>2018-11-29 01:18:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-29 01:18:40 +0000
commit3ba8f3a9d7a51b0864f22ef6b2be046fd6466b7d (patch)
tree44a58bc4bdfb162c1b93083baf41a2a2e45a26a1 /tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
parentb89bfac8c2980ac9c68598da19fbe97596e772a8 (diff)
parentfa91717ecc519f5ca5b26456a7f7ab3c77c253ce (diff)
Merge "toscaparser: Avoid exception when creating our own"1.1.1
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py b/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
index 89a6a03..8b49f48 100644
--- a/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
+++ b/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
@@ -49,12 +49,12 @@ class TypeValidation(object):
for name in custom_type:
if name not in self.ALLOWED_TYPE_SECTIONS:
ExceptionCollector.appendException(
- UnknownFieldError(what='Template ' + (self.import_def),
+ UnknownFieldError(what='Template ' + str(self.import_def),
field=name))
def _validate_type_version(self, version):
if version not in self.VALID_TEMPLATE_VERSIONS:
ExceptionCollector.appendException(
InvalidTemplateVersion(
- what=version + ' in ' + self.import_def,
+ what=version + ' in ' + str(self.import_def),
valid_versions=', '. join(self.VALID_TEMPLATE_VERSIONS)))