Replace except: with except Exception - still not great but it's less evil

Author: dmptrluke

cloudbot/util/cleverbot.py

@@ -122,6 +122,6 @@ def quote(s, safe='/'):
         safe_map[c] = (c in safe) and c or ('%%%02X' % i)
     try:
         res = list(map(safe_map.__getitem__, s))
-    except:
+    except Exception:
         return ''
     return ''.join(res)

cloudbot/util/formatting.py

@@ -202,13 +202,13 @@ def dict_format(args, formats):
             m = f.format(**args)
             # Insert match and number of matched values (max matched values if already in dict)
             matches[m] = max([matches.get(m, 0), len(re.findall(r'(\{.*?\})', f))])
-        except:
+        except Exception:
             continue
 
     # Return most complete match, ranked by values matched and then my match length or None
     try:
         return max(matches.items(), key=lambda x: (x[1], len(x[0])))[0]
-    except:
+    except Exception:
         return None
 
 

plugins/core_sieve.py

@@ -27,7 +27,6 @@ def init_tasks(loop, bot):
     loop.call_later(600, _func)
 
 
-
 @asyncio.coroutine
 @hook.sieve
 def sieve_suite(bot, event, _hook):

plugins/geoip.py

@@ -42,7 +42,7 @@ def update_db():
         else:
             try:
                 return geoip2.database.Reader(PATH)
-            except:
+            except Exception:
                 # issue loading, geo
                 fetch_db()
                 return geoip2.database.Reader(PATH)

plugins/imgur.py

@@ -87,7 +87,7 @@ def imgur(text):
     # if it's an imgur meme, add the meme name
     try:
         title = "\x02{}\x02 - {}".format(item.meme_metadata["meme_name"].lower(), title)
-    except:
+    except Exception:
         # this is a super un-important thing, so if it fails we don't care, carry on
         pass
 

plugins/quote.py

@@ -40,7 +40,7 @@ def add_quote(db, chan, target, sender, message):
         )
         db.execute(query)
         db.commit()
-    except:
+    except Exception:
         return "Message already stored, doing nothing."
     return "Quote added."
 

plugins/twitch.py

@@ -51,7 +51,7 @@ def twitch_lookup(location):
         else:
             try:
                 data = http.get_json("https://api.twitch.tv/kraken/channels/" + channel)
-            except:
+            except Exception:
                 return "Unable to get channel data. Maybe channel is on justin.tv instead of twitch.tv?"
             title = data['status']
             playing = data['game']

plugins/whois.py

@@ -14,19 +14,19 @@ def whois(text):
     try:
         i = "\x02Registrar\x02: {}".format(data["registrar"][0])
         info.append(i)
-    except:
+    except Exception:
         pass
 
     try:
         i = "\x02Registered\x02: {}".format(data["creation_date"][0].strftime("%d-%m-%Y"))
         info.append(i)
-    except:
+    except Exception:
         pass
 
     try:
         i = "\x02Expires\x02: {}".format(data["expiration_date"][0].strftime("%d-%m-%Y"))
         info.append(i)
-    except:
+    except Exception:
         pass
 
     info_text = ", ".join(info)