Config: Catch specific exceptions when wrapping ConfigParser methods

roehnan · Apr 1, 2016 · 14a9f2c · 14a9f2c
1 parent 1570934
commit 14a9f2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/boto/compat.py b/boto/compat.py
@@ -61,12 +61,13 @@
     # StandardError was removed, so use the base exception type instead
     StandardError = Exception
     long_type = int
-    from configparser import ConfigParser
+    from configparser import ConfigParser, NoOptionError, NoSectionError
     unquote_str = unquote_plus
 else:
     StandardError = StandardError
     long_type = long
     from ConfigParser import SafeConfigParser as ConfigParser
+    from ConfigParser import NoOptionError, NoSectionError
 
     def unquote_str(value, encoding='utf-8'):
         # In python2, unquote() gives us a string back that has the urldecoded

diff --git a/boto/pyami/config.py b/boto/pyami/config.py
@@ -26,7 +26,7 @@
 
 import boto
 
-from boto.compat import expanduser, ConfigParser, StringIO
+from boto.compat import expanduser, ConfigParser, NoOptionError, NoSectionError, StringIO
 
 
 # By default we use two locations for the boto configurations,
@@ -128,21 +128,21 @@ def save_system_option(self, section, option, value):
     def get_instance(self, name, default=None):
         try:
             val = self.get('Instance', name)
-        except:
+        except (NoOptionError, NoSectionError):
             val = default
         return val
 
     def get_user(self, name, default=None):
         try:
             val = self.get('User', name)
-        except:
+        except (NoOptionError, NoSectionError):
             val = default
         return val
 
     def getint_user(self, name, default=0):
         try:
             val = self.getint('User', name)
-        except:
+        except (NoOptionError, NoSectionError):
             val = default
         return val
 
@@ -156,7 +156,7 @@ def get(self, section, name, default=None):
             return default
         try:
             return impl.get(section, name)
-        except:
+        except (NoOptionError, NoSectionError):
             return default
 
     def getint(self, section, name, default=0):
@@ -166,7 +166,7 @@ def getint(self, section, name, default=0):
             return int(default)
         try:
             return impl.getint(section, name)
-        except:
+        except (NoOptionError, NoSectionError):
             return int(default)
 
     def getfloat(self, section, name, default=0.0):
@@ -176,7 +176,7 @@ def getfloat(self, section, name, default=0.0):
             return float(default)
         try:
             return impl.getfloat(section, name)
-        except:
+        except (NoOptionError, NoSectionError):
             return float(default)
 
     def getbool(self, section, name, default=False):