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 <shardy@redhat.com>

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index f8ea86b2b7186fb4e1821183452b8bf294464660..eb086716e35e770b16d8d7243dad59d37404c093 100644 (file)
--- 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)