Improve GeoIP, imgur, quote error handling, remove un-needed var in youtube,

Author: dmptrluke

plugins/geoip.py

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

plugins/imgur.py

@@ -2,6 +2,7 @@
 import random
 
 from imgurpython import ImgurClient
+from contextlib import suppress
 
 from cloudbot import hook
 from cloudbot.util import web
@@ -85,11 +86,9 @@ def imgur(text):
         title = item.title
 
     # if it's an imgur meme, add the meme name
-    try:
+    # if not, AttributeError will trigger and code will carry on
+    with suppress(AttributeError):
         title = "\x02{}\x02 - {}".format(item.meme_metadata["meme_name"].lower(), title)
-    except Exception:
-        # this is a super un-important thing, so if it fails we don't care, carry on
-        pass
 
     # if the item has a tag, show that
     if item.section:

plugins/quote.py

@@ -4,9 +4,12 @@
 
 from cloudbot import hook
 from cloudbot.util import botvars
+
+from sqlalchemy import select
 from sqlalchemy import Table, Column, String, PrimaryKeyConstraint
 from sqlalchemy.types import REAL
-from sqlalchemy import select
+from sqlalchemy.exc import IntegrityError
+
 
 qtable = Table(
     'quote',
@@ -40,7 +43,7 @@ def add_quote(db, chan, target, sender, message):
         )
         db.execute(query)
         db.commit()
-    except Exception:
+    except IntegrityError:
         return "Message already stored, doing nothing."
     return "Quote added."
 

plugins/youtube.py

@@ -19,8 +19,8 @@
 err_no_api = "The YouTube API is off in the Google Developers Console."
 
 
-def get_video_description(video_id, key):
-    json = requests.get(api_url.format(video_id, key)).json()
+def get_video_description(video_id):
+    json = requests.get(api_url.format(video_id, dev_key)).json()
 
     if json.get('error'):
         if json['error']['code'] == 403:
@@ -75,7 +75,7 @@ def load_key(bot):
 
 @hook.regex(youtube_re)
 def youtube_url(match):
-    return get_video_description(match.group(1), dev_key)
+    return get_video_description(match.group(1))
 
 
 @hook.command("youtube", "you", "yt", "y")
@@ -97,7 +97,7 @@ def youtube(text):
 
     video_id = json['items'][0]['id']['videoId']
 
-    return get_video_description(video_id, dev_key) + " - " + video_url % video_id
+    return get_video_description(video_id) + " - " + video_url % video_id
 
 
 @hook.command("youtime", "ytime")