Merge pull request CloudBotIRC#170 from linuxdaemon/gonzobot+fix-debug-mode-coros

Fix coroutine hooks erroring in asyncio debug mode

Author: edwardslabs

.travis.yml

@@ -5,6 +5,8 @@ python:
   - "3.6"
   - "3.7-dev"
 
+cache: pip
+
 install:
   - "sudo apt-get update -q"
   - "sudo apt-get install -y python3-lxml libenchant-dev"
@@ -18,3 +20,4 @@ after_success:
 
 env:
   - PYTHONPATH=.
+  - PYTHONPATH=. PYTHONASYNCIODEBUG=1

plugins/admin_bot.py

@@ -5,17 +5,17 @@
 from cloudbot.util import formatting
 
 
-@asyncio.coroutine
 @hook.command("groups", "listgroups", "permgroups", permissions=["permissions_users"], autohelp=False)
+@asyncio.coroutine
 def get_permission_groups(conn):
     """- lists all valid groups
     :type conn: cloudbot.client.Client
     """
     return "Valid groups: {}".format(conn.permissions.get_groups())
 
 
-@asyncio.coroutine
 @hook.command("gperms", permissions=["permissions_users"])
+@asyncio.coroutine
 def get_group_permissions(text, conn, notice):
     """<group> - lists permissions given to <group>
     :type text: str
@@ -33,8 +33,8 @@ def get_group_permissions(text, conn, notice):
         notice("Unknown group '{}'".format(group))
 
 
-@asyncio.coroutine
 @hook.command("gusers", permissions=["permissions_users"])
+@asyncio.coroutine
 def get_group_users(text, conn, notice):
     """<group> - lists users in <group>
     :type text: str
@@ -52,8 +52,8 @@ def get_group_users(text, conn, notice):
         notice("Unknown group '{}'".format(group))
 
 
-@asyncio.coroutine
 @hook.command("uperms", autohelp=False)
+@asyncio.coroutine
 def get_user_permissions(text, conn, mask, has_permission, notice):
     """[user] - lists all permissions given to [user], or the caller if no user is specified
     :type text: str
@@ -77,8 +77,8 @@ def get_user_permissions(text, conn, mask, has_permission, notice):
         return "User {} has no elevated permissions".format(user)
 
 
-@asyncio.coroutine
 @hook.command("ugroups", autohelp=False)
+@asyncio.coroutine
 def get_user_groups(text, conn, mask, has_permission, notice):
     """[user] - lists all permissions given to [user], or the caller if no user is specified
     :type text: str
@@ -102,8 +102,8 @@ def get_user_groups(text, conn, mask, has_permission, notice):
         return "User {} is in no permission groups".format(user)
 
 
-@asyncio.coroutine
 @hook.command("deluser", permissions=["permissions_users"])
+@asyncio.coroutine
 def remove_permission_user(text, nick, bot, conn, notice, reply, admin_log):
     """<user> [group] - removes <user> from [group], or from all groups if no group is specified
     :type text: str
@@ -164,8 +164,8 @@ def remove_permission_user(text, nick, bot, conn, notice, reply, admin_log):
         permission_manager.reload()
 
 
-@asyncio.coroutine
 @hook.command("adduser", permissions=["permissions_users"])
+@asyncio.coroutine
 def add_permissions_user(text, nick, conn, bot, notice, reply, admin_log):
     """<user> <group> - adds <user> to <group>
     :type text: str
@@ -208,8 +208,8 @@ def add_permissions_user(text, nick, conn, bot, notice, reply, admin_log):
         permission_manager.reload()
 
 
-@asyncio.coroutine
 @hook.command("stopthebot", permissions=["botcontrol"])
+@asyncio.coroutine
 def stop(text, bot):
     """[reason] - stops me with [reason] as its quit message.
     :type text: str
@@ -221,8 +221,8 @@ def stop(text, bot):
         yield from bot.stop()
 
 
-@asyncio.coroutine
 @hook.command(permissions=["botcontrol"])
+@asyncio.coroutine
 def restart(text, bot):
     """[reason] - restarts me with [reason] as its quit message.
     :type text: str
@@ -234,8 +234,8 @@ def restart(text, bot):
         yield from bot.restart()
 
 
-@asyncio.coroutine
 @hook.command(permissions=["botcontrol", "snoonetstaff"])
+@asyncio.coroutine
 def join(text, conn, nick, notice, admin_log):
     """<channel> - joins <channel>
     :type text: str
@@ -249,8 +249,8 @@ def join(text, conn, nick, notice, admin_log):
         conn.join(target)
 
 
-@asyncio.coroutine
 @hook.command(permissions=["botcontrol", "snoonetstaff"], autohelp=False)
+@asyncio.coroutine
 def part(text, conn, nick, chan, notice, admin_log):
     """[#channel] - parts [#channel], or the caller's channel if no channel is specified
     :type text: str
@@ -269,8 +269,8 @@ def part(text, conn, nick, chan, notice, admin_log):
         conn.part(target)
 
 
-@asyncio.coroutine
 @hook.command(autohelp=False, permissions=["botcontrol"])
+@asyncio.coroutine
 def cycle(text, conn, chan, notice):
     """[#channel] - cycles [#channel], or the caller's channel if no channel is specified
     :type text: str
@@ -289,8 +289,8 @@ def cycle(text, conn, chan, notice):
         conn.join(target)
 
 
-@asyncio.coroutine
 @hook.command(permissions=["botcontrol"])
+@asyncio.coroutine
 def nick(text, conn, notice, is_nick_valid):
     """<nick> - changes my nickname to <nick>
     :type text: str
@@ -304,8 +304,8 @@ def nick(text, conn, notice, is_nick_valid):
     conn.set_nick(text)
 
 
-@asyncio.coroutine
 @hook.command(permissions=["botcontrol"])
+@asyncio.coroutine
 def raw(text, conn, notice):
     """<command> - sends <command> as a raw IRC command
     :type text: str
@@ -315,8 +315,8 @@ def raw(text, conn, notice):
     conn.send(text)
 
 
-@asyncio.coroutine
 @hook.command(permissions=["botcontrol", "snoonetstaff"])
+@asyncio.coroutine
 def say(text, conn, chan, nick, admin_log):
     """[#channel] <message> - says <message> to [#channel], or to the caller's channel if no channel is specified
     :type text: str
@@ -335,8 +335,8 @@ def say(text, conn, chan, nick, admin_log):
     conn.message(channel, text)
 
 
-@asyncio.coroutine
 @hook.command("message", "sayto", permissions=["botcontrol", "snoonetstaff"])
+@asyncio.coroutine
 def message(text, conn, nick, admin_log):
     """<name> <message> - says <message> to <name>
     :type text: str
@@ -349,8 +349,8 @@ def message(text, conn, nick, admin_log):
     conn.message(channel, text)
 
 
-@asyncio.coroutine
 @hook.command("me", "act", permissions=["botcontrol", "snoonetstaff"])
+@asyncio.coroutine
 def me(text, conn, chan, nick, admin_log):
     """[#channel] <action> - acts out <action> in a [#channel], or in the current channel of none is specified
     :type text: str
@@ -369,8 +369,8 @@ def me(text, conn, chan, nick, admin_log):
     conn.ctcp(channel, "ACTION", text)
 
 
-@asyncio.coroutine
 @hook.command(autohelp=False, permissions=["botcontrol"])
+@asyncio.coroutine
 def listchans(conn, chan, message, notice):
     """- Lists the current channels the bot is in"""
     chans = ', '.join(sorted(conn.channels, key=lambda x: x.strip('#').lower()))

plugins/autojoin.py

@@ -31,8 +31,8 @@ def load_cache(db):
             chan_cache[row['conn']].add(row['chan'])
 
 
-@asyncio.coroutine
 @hook.irc_raw('376')
+@asyncio.coroutine
 def do_joins(conn):
     join_throttle = conn.config.get("join_throttle", 0.4)
     for chan in chan_cache[conn.name]:

plugins/brainfuck.py

@@ -11,8 +11,8 @@
 MAX_STEPS = 1000000
 
 
-@asyncio.coroutine
 @hook.command("brainfuck", "bf")
+@asyncio.coroutine
 def bf(text):
     """<prog> - executes <prog> as Brainfuck code
     :type text: str

plugins/chain.py

@@ -130,8 +130,8 @@ def wrap_event(_hook, event, cmd, args):
     return cmd_event
 
 
-@asyncio.coroutine
 @hook.command
+@asyncio.coroutine
 def chain(text, bot, event):
     """<cmd1> [args...] | <cmd2> [args...] | ... - Runs commands in a chain, piping the output from previous commands to tne next"""
     cmds = parse_chain(text, bot)

plugins/core/cap.py

@@ -76,8 +76,8 @@ def _launch_handler(subcmd, event, **kwargs):
         yield from async_util.run_func(event.loop, handler, *args)
 
 
-@asyncio.coroutine
 @_subcmd_handler("LS")
+@asyncio.coroutine
 def cap_ls(conn, caplist, event, irc_paramlist, bot, logger):
     logger.info("[%s|cap] Available capabilities: %s", conn.name, caplist)
     yield from handle_available_caps(conn, caplist, event, irc_paramlist, bot)
@@ -102,14 +102,14 @@ def handle_req_resp(enabled, conn, caplist, event, bot):
             cap_queue[cap].set_result(enabled)
 
 
-@asyncio.coroutine
 @_subcmd_handler("ACK")
+@asyncio.coroutine
 def cap_ack_nak(conn, caplist, event, bot):
     yield from handle_req_resp(True, conn, caplist, event, bot)
 
 
-@asyncio.coroutine
 @_subcmd_handler("NAK")
+@asyncio.coroutine
 def cap_nak(conn, caplist, event, bot):
     yield from handle_req_resp(False, conn, caplist, event, bot)
 
@@ -119,8 +119,8 @@ def cap_list(logger, caplist, conn):
     logger.info("[%s|cap] Enabled Capabilities: %s", conn.name, caplist)
 
 
-@asyncio.coroutine
 @_subcmd_handler("NEW")
+@asyncio.coroutine
 def cap_new(logger, caplist, conn, event, bot, irc_paramlist):
     logger.info("[%s|cap] New capabilities advertised: %s", conn.name, caplist)
     yield from handle_available_caps(conn, caplist, event, irc_paramlist, bot)
@@ -135,8 +135,8 @@ def cap_del(logger, conn, caplist):
         server_caps[cap.name.casefold()] = False
 
 
-@asyncio.coroutine
 @hook.irc_raw("CAP")
+@asyncio.coroutine
 def on_cap(irc_paramlist, event):
     args = {}
     if len(irc_paramlist) > 2:

plugins/core/check_conn.py

@@ -36,8 +36,8 @@ def do_reconnect(conn):
     return "Reconnected to '{}'".format(conn.name)
 
 
-@asyncio.coroutine
 @hook.command(autohelp=False, permissions=["botcontrol"], singlethread=True)
+@asyncio.coroutine
 def reconnect(conn, text, bot):
     """[connection] - Reconnects to [connection] or the current connection if not specified"""
     if not text:
@@ -83,9 +83,9 @@ def on_connect(conn):
     conn.memory["lag"] = 0
 
 
-@asyncio.coroutine
 @hook.command("lagcheck", autohelp=False, permissions=["botcontrol"])
 @hook.periodic(30)
+@asyncio.coroutine
 def lag_check(bot):
     now = time.time()
     for conn in bot.connections.values():

plugins/core/core_misc.py

@@ -8,8 +8,8 @@
 
 
 # Auto-join on Invite (Configurable, defaults to True)
-@asyncio.coroutine
 @hook.irc_raw('INVITE')
+@asyncio.coroutine
 def invite(irc_paramlist, conn):
     """
     :type irc_paramlist: list[str]
@@ -61,8 +61,8 @@ def on_mode_change(conn, irc_paramlist, message):
 
 
 # Identify to NickServ (or other service)
-@asyncio.coroutine
 @hook.irc_raw('004')
+@asyncio.coroutine
 def onjoin(conn, bot):
     """
     :type conn: cloudbot.clients.clients.IrcClient
@@ -105,8 +105,8 @@ def onjoin(conn, bot):
     bot.logger.info("[{}|misc] Bot has finished sending join commands for network.".format(conn.name))
 
 
-@asyncio.coroutine
 @hook.irc_raw('376')
+@asyncio.coroutine
 def do_joins(logger, conn):
     chans = copy(conn.channels)
 
@@ -118,8 +118,8 @@ def do_joins(logger, conn):
         yield from asyncio.sleep(join_throttle)
 
 
-@asyncio.coroutine
 @hook.irc_raw('004')
+@asyncio.coroutine
 def keep_alive(conn):
     """
     :type conn: cloudbot.clients.clients.IrcClient
@@ -137,8 +137,8 @@ def on_nick_in_use(conn, irc_paramlist):
     conn.cmd("NICK", conn.nick)
 
 
-@asyncio.coroutine
 @hook.irc_raw('432', singlethread=True)
+@asyncio.coroutine
 def on_invalid_nick(conn):
     nick = conn.config['nick']
     conn.nick = nick

plugins/core/core_sieve.py

@@ -18,8 +18,8 @@ def task_clear(loop):
     loop.call_later(600, task_clear, loop)
 
 
-@asyncio.coroutine
 @hook.irc_raw('004')
+@asyncio.coroutine
 def init_tasks(loop, conn):
     global ready
     if ready:
@@ -31,8 +31,8 @@ def init_tasks(loop, conn):
     ready = True
 
 
-@asyncio.coroutine
 @hook.sieve(priority=100)
+@asyncio.coroutine
 def sieve_suite(bot, event, _hook):
     global buckets