From 1604924a48115ed21d54016343a3173e039f6ec7 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 2 May 2019 19:42:15 -0400 Subject: [PATCH] CommandsQuery/BotEvents adjustments for consistancy --- sopel_modules/SpiceBot_Botevents/Connected.py | 6 +++--- sopel_modules/SpiceBot_Botevents/Startup_Complete.py | 6 +++--- sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py | 4 ++-- sopel_modules/SpiceBot_CommandsQuery/__init__.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sopel_modules/SpiceBot_Botevents/Connected.py b/sopel_modules/SpiceBot_Botevents/Connected.py index fe93a79..a027c66 100644 --- a/sopel_modules/SpiceBot_Botevents/Connected.py +++ b/sopel_modules/SpiceBot_Botevents/Connected.py @@ -2,15 +2,15 @@ from __future__ import unicode_literals, absolute_import, division, print_function -from sopel import module +import sopel.module from sopel.tools import stderr from .BotEvents import check_bot_events, startup_bot_event, set_bot_event import time -@module.event('001') -@module.rule('.*') +@sopel.module.event('001') +@sopel.module.rule('.*') def bot_startup_connection(bot, trigger): if check_bot_events(bot, ["startup_complete"]): diff --git a/sopel_modules/SpiceBot_Botevents/Startup_Complete.py b/sopel_modules/SpiceBot_Botevents/Startup_Complete.py index aa84ef3..6891b79 100644 --- a/sopel_modules/SpiceBot_Botevents/Startup_Complete.py +++ b/sopel_modules/SpiceBot_Botevents/Startup_Complete.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals, absolute_import, division, print_function -from sopel import module +import sopel.module from sopel.tools import stderr from .BotEvents import set_bot_event, check_bot_startup -@module.event('001') -@module.rule('.*') +@sopel.module.event('001') +@sopel.module.rule('.*') def bot_startup_complete(bot, trigger): while not check_bot_startup(bot): diff --git a/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py b/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py index 20cb960..c8bafaa 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py +++ b/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals, absolute_import, division, print_function import sopel -from sopel import module +import sopel.module from sopel.tools import stderr import os @@ -150,7 +150,7 @@ def setup_thread(bot): set_bot_event(bot, "Sopel-CommandsQuery") -@module.rule('^\?(.*)') +@sopel.module.rule('^\?(.*)') def query_detection(bot, trigger): while "Sopel-CommandsQuery" not in bot.memory: diff --git a/sopel_modules/SpiceBot_CommandsQuery/__init__.py b/sopel_modules/SpiceBot_CommandsQuery/__init__.py index 4cd2977..a169d76 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/__init__.py +++ b/sopel_modules/SpiceBot_CommandsQuery/__init__.py @@ -5,7 +5,7 @@ Sopel Commands Query responds to ? to display commands matching patterns """ from __future__ import unicode_literals, absolute_import, division, print_function -from .commandsquery import * +from .CommandsQuery import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net'