From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 21 May 2013 09:02:27 +0000 (+0000)
Subject: Merge "Fix PEP H902 (Use the 'not in' operator)"
X-Git-Tag: 2014.1~579
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7a7774d8e21bf359e3178664f79a12f0b545a631;p=openstack-build%2Fheat-build.git

Merge "Fix PEP H902 (Use the 'not in' operator)"
---

7a7774d8e21bf359e3178664f79a12f0b545a631
diff --cc heat/engine/parser.py
index 2d5a8c4c,fc30a4e2..624d7f78
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@@ -349,14 -349,20 +349,14 @@@ class Stack(object)
              try:
                  # First delete any resources which are not in newstack
                  for res in reversed(self):
-                     if not res.name in newstack.keys():
+                     if res.name not in newstack.keys():
                          logger.debug("resource %s not found in updated stack"
                                       % res.name + " definition, deleting")
 -                        try:
 -                            res.destroy()
 -                        except exception.ResourceFailure as ex:
 -                            logger.error("Failed to remove %s : %s" %
 -                                         (res.name, str(ex)))
 -                            raise exception.ResourceUpdateFailed(
 -                                resource_name=res.name)
 -                        else:
 -                            del self.resources[res.name]
 -                            self.dependencies = self._get_dependencies(
 -                                self.resources.itervalues())
 +                        # res.destroy raises exception.ResourceFailure on error
 +                        res.destroy()
 +                        del self.resources[res.name]
 +                        self.dependencies = self._get_dependencies(
 +                            self.resources.itervalues())
  
                  # Then create any which are defined in newstack but not self
                  for res in newstack: