From 8da4ddf51fedefdb1601baf7359e128f22f396e2 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Wed, 12 Sep 2012 08:11:30 -0700 Subject: [PATCH] Make S3 import except on ImportError rather then all exceptions Change-Id: Icb98aed65ccba825f8402fdde95ac38b2a12c1a6 Signed-off-by: Steven Dake --- heat/engine/resources.py | 2 +- heat/engine/s3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/heat/engine/resources.py b/heat/engine/resources.py index 428cd736..46717af3 100644 --- a/heat/engine/resources.py +++ b/heat/engine/resources.py @@ -24,7 +24,7 @@ from keystoneclient.v2_0 import client as kc try: from swiftclient import client as swiftclient swiftclient_present = True -except: +except ImportError: swiftclient_present = False from heat.common import exception diff --git a/heat/engine/s3.py b/heat/engine/s3.py index 7a181635..f266f93d 100644 --- a/heat/engine/s3.py +++ b/heat/engine/s3.py @@ -23,7 +23,7 @@ from heat.openstack.common import log as logging try: from swiftclient.client import ClientException swiftclient_present = True -except: +except ImportError: swiftclient_present = False logger = logging.getLogger('heat.engine.s3') -- 2.45.2