diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-19 14:23:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-19 14:23:44 +0000 |
| commit | be620c74d492cb2e4b9ad3055832e36849a3ac6b (patch) | |
| tree | 5d919e23cf404d4aa8d999dd7dfc6f7b30d2d48e /tosca2heat/tosca-parser/toscaparser/elements/artifacttype.py | |
| parent | 86b894e80fcb29f0354109730ee37bff20b1a89b (diff) | |
| parent | f977b94e012828cd2a905b9b841aff33c4b732f8 (diff) | |
Merge "Update the upstream of tosco-parser and heat-translator to stable release 0.6/0.5"
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.''' |