From 8e7294a7c3178222f94ce1cea45d77d70d5ac95e Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Tue, 24 Jun 2014 11:31:46 +0200 Subject: [PATCH] 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 --- heat/engine/cfn/template.py | 3 ++- heat/engine/hot/template.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/heat/engine/cfn/template.py b/heat/engine/cfn/template.py index 413a61141f..02a7d03466 100644 --- a/heat/engine/cfn/template.py +++ b/heat/engine/cfn/template.py @@ -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(): diff --git a/heat/engine/hot/template.py b/heat/engine/hot/template.py index 8cb5b3acb9..3dcf4fc610 100644 --- a/heat/engine/hot/template.py +++ b/heat/engine/hot/template.py @@ -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():