replace all usage of bare except clause with except Exception clause

[tools/sat.git] / src / pyconf.py

diff --git a/src/pyconf.py b/src/pyconf.py
index 5957d6ddcf8a12cbe2d5d971bf3eac266ca50ada..d19b5776c421d7c92ef1828598c1816e195f7e5e 100644 (file)
--- a/src/pyconf.py
+++ b/src/pyconf.py
@@ -155,7 +155,7 @@ else:
 
 try:
     has_utf32 = True
-except:
+except Exception:
     has_utf32 = False
 
 class ConfigInputStream(object):
@@ -951,7 +951,7 @@ class Reference(object):
                         rv = eval(str(self)[1:-1], vars(ns))
                         found = True
                         break
-                    except:
+                    except Exception:
                         pass
                 if found:
                     break
@@ -963,7 +963,7 @@ class Reference(object):
                         key = item[1]
                         rv = rv[key]
                     break
-                except:
+                except Exception:
                     rv = None
                     pass
             current = object.__getattribute__(current, 'parent')
@@ -1632,13 +1632,13 @@ class ConfigMerger(object):
                             continue
                         try:
                             exec( 'map1.' + key + " = " + repr(overwrite_instruction[key]))
-                        except:
+                        except Exception:
                             exec('map1.' + key + " = " + str(overwrite_instruction[key]))
             else:
                 for key in overwrite_instruction.keys():
                     try:
                         exec('map1.' + key + " = " + repr(overwrite_instruction[key]))
-                    except:
+                    except Exception:
                         exec('map1.' + key + " = " + str(overwrite_instruction[key]))
 
     def mergeMapping(self, map1, map2):