Merge pull request CloudBotIRC#148 from linuxdaemon/gonzobot+load-fixes

Fix various errors/warnings during plugin load

Author: edwardslabs

plugins/bible.py

@@ -2,7 +2,7 @@
 
 from cloudbot import hook
 
-@hook.command("bible", "passage", singlethreaded=True)
+@hook.command("bible", "passage", singlethread=True)
 def bible(text):
     """Prints the specified passage from the Bible"""
     passage = text.strip()

plugins/imgur.py

@@ -49,10 +49,12 @@ def get_items(text):
 def load_api(bot):
     global imgur_api
 
-    client_id = bot.config.get("api_keys", {}).get("imgur_client_id")
-    client_secret = bot.config.get("api_keys", {}).get("imgur_client_secret")
+    api_keys = bot.config.get("api_keys", {})
+    client_id = api_keys.get("imgur_client_id")
+    client_secret = api_keys.get("imgur_client_secret")
 
-    if None in (client_id, client_secret):
+    if not (client_id and client_secret):
+        # Either the client id or secret aren't specified
         imgur_api = None
         return
     else:

plugins/quran.py

@@ -20,7 +20,7 @@ def smart_truncate(content, length=425, suffix='...\n'):
         return content[:length].rsplit(' ', 1)[0]+ suffix + content[:length].rsplit(' ', 1)[1] + smart_truncate(content[length:])
 
 
-@hook.command("quran", "verse", singlethreaded=True)
+@hook.command("quran", "verse", singlethread=True)
 def quran(text, message):
     """Prints the specified Qur'anic verse(s) and its/their translation(s)"""
     api_url = "http://quranapi.azurewebsites.net/api/verse/"