From 099fc71fa1f4a3031b11c4d176589fa21cf6eb4f Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 4 Feb 2013 12:08:29 +0000 Subject: [PATCH] heat engine : Resource remove redundant None get defaults get(k) returns None anyway if k doesn't exist, so the default to None is not needed Change-Id: Id954c510a5c4795b5e0c3ccdcca186983dee2e8f Signed-off-by: Steven Hardy --- heat/engine/resource.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/engine/resource.py b/heat/engine/resource.py index f8ea86b2..eb086716 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -194,15 +194,15 @@ class Resource(object): # Create a set of keys which differ (or are missing/added) changed_keys_set = set([k for k in template_keys - if current_snippet.get(k, None) != - json_snippet.get(k, None)]) + if current_snippet.get(k) != + json_snippet.get(k)]) if not changed_keys_set.issubset(update_allowed_set): badkeys = changed_keys_set - update_allowed_set raise NotImplementedError("Cannot update keys %s for %s" % (badkeys, self.name)) - return dict((k, json_snippet.get(k, None)) for k in changed_keys_set) + return dict((k, json_snippet.get(k)) for k in changed_keys_set) def __str__(self): return '%s "%s"' % (self.__class__.__name__, self.name) -- 2.45.2