openstack
/
heat
Code Issues Proposed changes

Don't rely on setdefault returning a value 

Workaround a bug in sqlalchemy>=0.9.5 where setdefault doesn't return
the proper value.

Change-Id: Ibc93024f7f41f4ced81525fac42566a18b1c641c
Closes-Bug: #1333556
This commit is contained in:
Thomas Herve 2014-06-24 11:31:46 +02:00
parent 7d7621bbec
commit 8e7294a7c3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/cfn/template.py
View File

@ -145,7 +145,8 @@ class CfnTemplate(template.Template):
if len(cfn_tmpl.get(RES_DEPENDS_ON, [])) == 1:
cfn_tmpl[RES_DEPENDS_ON] = cfn_tmpl[RES_DEPENDS_ON][0]
self.t.setdefault(self.RESOURCES, {})[name] = cfn_tmpl
self.t.setdefault(self.RESOURCES, {})
self.t[self.RESOURCES][name] = cfn_tmpl
def template_mapping():

3
heat/engine/hot/template.py
View File

@ -221,7 +221,8 @@ class HOTemplate(template.Template):
if name is None:
name = definition.name
self.t.setdefault(self.RESOURCES, {})[name] = definition.render_hot()
self.t.setdefault(self.RESOURCES, {})
self.t[self.RESOURCES][name] = definition.render_hot()
def template_mapping():