Make S3 import except on ImportError rather then all exceptions

Change-Id: Icb98aed65ccba825f8402fdde95ac38b2a12c1a6
Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index 428cd736ad0da79db7d15bfe7d461110f8bccc61..46717af33fa6cb18f74e7e8c81dbdfd503639839 100644 (file)
--- 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 7a1816357472f596b26e7e13ba4abb383408e148..f266f93da6869b0b7d804f7f9a2f89e1dc11831f 100644 (file)
--- 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')