Rename bot to _bot in launcher

Author: dmptrluke

cloudbot/__main__.py

@@ -29,7 +29,7 @@ def main():
     logger.info("Starting CloudBot.")
 
     # create the bot
-    bot = CloudBot()
+    _bot = CloudBot()
 
     # whether we are killed while restarting
     stopped_while_restarting = False
@@ -40,11 +40,11 @@ def main():
     # define closure for signal handling
     def exit_gracefully(signum, frame):
         nonlocal stopped_while_restarting
-        if not bot:
+        if not _bot:
             # we are currently in the process of restarting
             stopped_while_restarting = True
         else:
-            bot.loop.call_soon_threadsafe(lambda: asyncio.async(bot.stop("Killed"), loop=bot.loop))
+            _bot.loop.call_soon_threadsafe(lambda: asyncio.async(_bot.stop("Killed"), loop=_bot.loop))
 
         # restore the original handler so if they do it again it triggers
         signal.signal(signal.SIGINT, original_sigint)
@@ -54,12 +54,12 @@ def exit_gracefully(signum, frame):
     # start the bot master
 
     # CloudBot.run() will return True if it should restart, False otherwise
-    restart = bot.run()
+    restart = _bot.run()
 
     # the bot has stopped, do we want to restart?
     if restart:
         # remove reference to cloudbot, so exit_gracefully won't try to stop it
-        bot = None
+        _bot = None
         # sleep one second for timeouts
         time.sleep(1)
         if stopped_while_restarting:

plugins/soundcloud.py

@@ -186,24 +186,6 @@ def soundcloud_user(text):
     except APIError as ae:
         return ae
 
-@hook.command("scgroup")
-def soundcloud_group(text):
-    """<query> -- Searches for groups on SoundCloud."""
-    if not api_key:
-        return "This command requires a SoundCloud API key."
-    try:
-        group = get_with_search('groups', text)
-    except APIError as ae:
-        return ae
-
-    if not group:
-        return "No results found."
-
-    try:
-        return format_group(group)
-    except APIError as ae:
-        return ae
-
 
 @hook.regex(SC_RE)
 def soundcloud_url(match):