diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-14 14:36:33 +0800 |
|---|---|---|
| committer | xiaodong shang <shang.xiaodong@zte.com.cn> | 2016-09-19 14:23:56 +0000 |
| commit | 16d01a2dea9ac5447697b44a8d37dc05cb681f71 (patch) | |
| tree | 2b0cfa2aaf72b1d4e4ebef4e2ccbbb091a4f140c /tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py | |
| parent | fa44d0821c35d401be256ced90eda934b20bf8d6 (diff) | |
Update the upstream of tosco-parser and heat-translator to stable
release 0.6/0.5
Currently the parser is based on dev branch of upstream projects,
include tosco-parser and heat-translator, for the colorado release of
parser, it should be based on a stable version, so it's necessary to
update the upstream version to 0.6/tosca-parser and 0.5/heat-translator.
JIRA:PARSER-106
Change-Id: I8fb043068d25188c47e5648e1b66184446ac82d6
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
(cherry picked from commit f977b94e012828cd2a905b9b841aff33c4b732f8)
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py b/tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py index 887e99a..bf379fc 100644 --- a/tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py +++ b/tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py @@ -31,7 +31,6 @@ class ArtifactTypeDef(StatefulEntityType): parent_artif = self.parent_type.type if self.parent_type else None if parent_artif: while parent_artif != 'tosca.artifacts.Root': - # only support normative artifact, shall be modified future artifacts[parent_artif] = self.TOSCA_DEF[parent_artif] parent_artif = artifacts[parent_artif]['derived_from'] return artifacts @@ -44,8 +43,6 @@ class ArtifactTypeDef(StatefulEntityType): partifact_entity = self.derived_from(self.defs) if partifact_entity: return ArtifactTypeDef(partifact_entity, self.custom_def) - else: - return None def get_artifact(self, name): '''Return the definition of an artifact field by name.''' |