Eliminate overly-broad exception catching

We probably don't want to catch e.g. KeyboardInterrupt in these cases.

Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 7d47c3db1ee29acd61ce1d757f0a20e6b59e0714..7d46f3d216f5d171e132dc02e8416255e6025a11 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -51,7 +51,7 @@ class EngineManager(manager.Manager):
             try:
                 mem['template_description'] = s.template.description
                 mem['stack_status'] = ps.t['StackStatus']
-            except:
+            except KeyError:
                 mem['template_description'] = 'No description'
                 mem['stack_status'] = 'unknown'
             res['stacks'].append(mem)
@@ -76,7 +76,7 @@ class EngineManager(manager.Manager):
             try:
                 mem['TemplateDescription'] = ps.t['Description']
                 mem['StackStatus'] = ps.t['StackStatus']
-            except:
+            except KeyError:
                 mem['TemplateDescription'] = 'No description'
                 mem['StackStatus'] = 'unknown'
             res['stacks'].append(mem)

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 4f1848eb95d7a8434d4dd53294b475ff6efd3128..4a10b9ae048c10cc94165160b6a1eeffbe02c34b 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -226,7 +226,7 @@ class Stack(object):
                     key_name = 'Parameters.member.%s.ParameterKey' % s[2]
                     value_name = 'Parameters.member.%s.ParameterValue' % s[2]
                     self._apply_user_parameter(parms[key_name], parms[value_name])
-                except:
+                except Exception:
                     logger.error('Could not apply parameter %s' % p)
 
     def parameter_get(self, key):
@@ -317,8 +317,8 @@ class Stack(object):
                     j = None
                     try:
                         j = s[i][0].join(s[i][1])
-                    except:
-                        print '*** could not join %s' % s[i]
+                    except Exception:
+                        logger.error('Could not join %s' % str(s[i]))
                     return j
                 else:
                     s[i] = self.resolve_joins(s[i])

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index c25b8048b8fbb715e9cfd6bf9500efd7ac8bfb85..66c7577c6e393e12937eefa2001f902fea9bc8dd 100644 (file)
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -310,7 +310,7 @@ class VolumeAttachment(Resource):
             try:
                 self.nova().volumes.delete_server_volume(self.t['Properties']['InstanceId'],
                                                          self.instance_id)
-            except:
+            except Exception:
                 pass
             vol.get()