From 4d7e2721ea74c69ef02ff16e86dc6a3ee1265eb9 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 13 Apr 2012 12:10:10 +0200 Subject: [PATCH] Eliminate overly-broad exception catching We probably don't want to catch e.g. KeyboardInterrupt in these cases. Signed-off-by: Zane Bitter --- heat/engine/manager.py | 4 ++-- heat/engine/parser.py | 6 +++--- heat/engine/resources.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/heat/engine/manager.py b/heat/engine/manager.py index 7d47c3db..7d46f3d2 100644 --- 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 4f1848eb..4a10b9ae 100644 --- 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 c25b8048..66c7577c 100644 --- 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() -- 2.45.2