Restyling redundant 'except Exception' form

stamparm · stamparm · commit 834be1eddced · 2013-01-10T15:54:28.000+01:00
diff --git a/extra/beep/beep.py b/extra/beep/beep.py
@@ -24,7 +24,7 @@ def beep():
             _linux_wav_play(BEEP_WAV_FILENAME)
         else:
             _speaker_beep()
-    except Exception:
+    except:
         _speaker_beep()
 
 def _speaker_beep():
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -3192,7 +3192,7 @@ def _(value):
 
     try:
         retVal = applyFunctionRecursively(value, _)
-    except Exception:
+    except:
         singleTimeWarnMessage("there was a problem decoding value '%s' from expected hexadecimal form" % value)
 
     return retVal
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -639,7 +639,7 @@ def _(key, value):
                     _ = ConnectRegistry(None, HKEY_LOCAL_MACHINE)
                     _ = OpenKey(_, key)
                     retVal = QueryValueEx(_, value)[0]
-                except Exception:
+                except:
                     logger.debug("unable to identify Metasploit installation path via registry key")
 
                 return retVal
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
@@ -500,7 +500,7 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
             except (UnicodeEncodeError, UnicodeDecodeError):
                 pass  # ignore possible encoding problems caused by some words in custom dictionaries
 
-            except Exception:
+            except:
                 warnMsg = "there was a problem while hashing entry: %s. " % repr(word)
                 warnMsg += "Please report by e-mail to %s" % ML
                 logger.critical(warnMsg)
