From 072d4167ed91808ac6d6440e0a52d89845db29af Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 5 May 2019 21:29:20 -0400 Subject: [PATCH] Code Cleanup --- sopel_modules/SpiceBot_BotPrivs/BotPrivs.py | 12 ------------ .../SpiceBot_CommandsQuery/CommandsQuery.py | 6 +----- .../SpiceBot_Database_Addons/Databaseaddons.py | 4 ---- .../SpiceBot_Database_Tools/DatabaseTools.py | 12 ------------ sopel_modules/SpiceBot_Docs/Docs.py | 12 ------------ sopel_modules/SpiceBot_Events/System.py | 4 ---- sopel_modules/SpiceBot_FriendlyBot/FriendlyBot.py | 12 ------------ sopel_modules/SpiceBot_Gender/Gender.py | 12 ------------ .../SpiceBot_InsultHandler/InsultHandler.py | 12 ------------ sopel_modules/SpiceBot_LoadOrder/LoadOrder.py | 5 ----- sopel_modules/SpiceBot_Messaging/Messaging.py | 12 ------------ sopel_modules/SpiceBot_Restart/Restart.py | 12 ------------ .../SpiceBot_StartupMonologue/StartupMonologue.py | 12 ------------ sopel_modules/SpiceBot_Update/Update.py | 4 ---- sopel_modules/SpiceBot_Uptime/Uptime.py | 4 ---- sopel_modules/SpiceBot_osd/__init__.py | 5 ----- 16 files changed, 1 insertion(+), 139 deletions(-) diff --git a/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py b/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py index 1954150..50dce5c 100644 --- a/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py +++ b/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py @@ -9,18 +9,6 @@ import spicemanip from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, bot_privs -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.nickname_commands('owners', 'owner') def bot_command_owners(bot, trigger): bot_command_process(bot, trigger) diff --git a/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py b/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py index 8c90401..b52098a 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py +++ b/sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py @@ -7,17 +7,13 @@ import sopel.module import os -from sopel_modules.SpiceBot_LoadOrder.LoadOrder import set_bot_event, check_bot_events, startup_bot_event +from sopel_modules.SpiceBot_LoadOrder.LoadOrder import set_bot_event, startup_bot_event from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger from sopel_modules.SpiceBot_SBTools import bot_logging import spicemanip -def configure(config): - pass - - def setup(bot): bot_logging(bot, 'SpiceBot_CommandsQuery', "Starting setup procedure") bot_events_startup_register(bot, ['2002']) diff --git a/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py b/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py index ad33a4e..7c07129 100644 --- a/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py +++ b/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py @@ -21,10 +21,6 @@ def setup(bot): SopelDB._create_table = SopelDBCache._create_table -def shutdown(bot): - pass - - class SopelDBCache: """Dynamic Table Creation""" diff --git a/sopel_modules/SpiceBot_Database_Tools/DatabaseTools.py b/sopel_modules/SpiceBot_Database_Tools/DatabaseTools.py index 53242da..816c56f 100644 --- a/sopel_modules/SpiceBot_Database_Tools/DatabaseTools.py +++ b/sopel_modules/SpiceBot_Database_Tools/DatabaseTools.py @@ -6,18 +6,6 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi import sopel.module -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - """Dyanmic Table Creation""" diff --git a/sopel_modules/SpiceBot_Docs/Docs.py b/sopel_modules/SpiceBot_Docs/Docs.py index bdda514..e1daf4a 100644 --- a/sopel_modules/SpiceBot_Docs/Docs.py +++ b/sopel_modules/SpiceBot_Docs/Docs.py @@ -9,18 +9,6 @@ import spicemanip from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, bot_privs, github_dict -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.nickname_commands('help', 'docs', 'wiki') def bot_command_owners(bot, trigger): bot.osd(["IRC Modules Repository", str(github_dict["url_main"] + github_dict["repo_owner"] + "/" + github_dict["repo_name"] + github_dict["url_path_wiki"])]) diff --git a/sopel_modules/SpiceBot_Events/System.py b/sopel_modules/SpiceBot_Events/System.py index d96005c..50db905 100644 --- a/sopel_modules/SpiceBot_Events/System.py +++ b/sopel_modules/SpiceBot_Events/System.py @@ -8,10 +8,6 @@ import sopel from sopel_modules.SpiceBot_SBTools import bot_logging -def configure(config): - pass - - def setup(bot): bot_logging(bot, 'SpiceBot_Events', "Starting setup procedure") bot_events_setup_check(bot) diff --git a/sopel_modules/SpiceBot_FriendlyBot/FriendlyBot.py b/sopel_modules/SpiceBot_FriendlyBot/FriendlyBot.py index c0c8086..5d139bd 100644 --- a/sopel_modules/SpiceBot_FriendlyBot/FriendlyBot.py +++ b/sopel_modules/SpiceBot_FriendlyBot/FriendlyBot.py @@ -7,18 +7,6 @@ import sopel.module import spicemanip -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.rule(r'(?i)(hi|hello|hey),? $nickname[ \t]*$') def bot_command_hello(bot, trigger): hello = spicemanip.main(['Hi', 'Hey', 'Hello'], "random") diff --git a/sopel_modules/SpiceBot_Gender/Gender.py b/sopel_modules/SpiceBot_Gender/Gender.py index f74655d..a2a8f5f 100644 --- a/sopel_modules/SpiceBot_Gender/Gender.py +++ b/sopel_modules/SpiceBot_Gender/Gender.py @@ -5,18 +5,6 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.nickname_commands('gender') def bot_command_gender(bot, trigger): bot.osd("If societal genders are binary, my gender is female") diff --git a/sopel_modules/SpiceBot_InsultHandler/InsultHandler.py b/sopel_modules/SpiceBot_InsultHandler/InsultHandler.py index 311ed8e..19c1c69 100644 --- a/sopel_modules/SpiceBot_InsultHandler/InsultHandler.py +++ b/sopel_modules/SpiceBot_InsultHandler/InsultHandler.py @@ -5,18 +5,6 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.rule(r'(?i)(Fuck|Screw) (you|off),? $nickname[ \t]*$') def bot_command_srewyou(bot, trigger): bot.osd("Watch your mouth, " + trigger.nick + ", or I'll tell your mother!") diff --git a/sopel_modules/SpiceBot_LoadOrder/LoadOrder.py b/sopel_modules/SpiceBot_LoadOrder/LoadOrder.py index 7284293..8856734 100644 --- a/sopel_modules/SpiceBot_LoadOrder/LoadOrder.py +++ b/sopel_modules/SpiceBot_LoadOrder/LoadOrder.py @@ -10,12 +10,7 @@ from sopel_modules.SpiceBot_SBTools import bot_logging import threading -def configure(config): - pass - - def setup(bot): - # TODO add custom pretrigger events bot_logging(bot, 'Sopel_LoadOrder', "Starting Module Events Logging") threading.Thread(target=setup_thread, args=(bot,)).start() diff --git a/sopel_modules/SpiceBot_Messaging/Messaging.py b/sopel_modules/SpiceBot_Messaging/Messaging.py index 8b24a0b..5425bed 100644 --- a/sopel_modules/SpiceBot_Messaging/Messaging.py +++ b/sopel_modules/SpiceBot_Messaging/Messaging.py @@ -9,18 +9,6 @@ import spicemanip from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, inlist -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.nickname_commands('action') def bot_command_action(bot, trigger): bot_command_process(bot, trigger) diff --git a/sopel_modules/SpiceBot_Restart/Restart.py b/sopel_modules/SpiceBot_Restart/Restart.py index 5e078e7..b6870ee 100644 --- a/sopel_modules/SpiceBot_Restart/Restart.py +++ b/sopel_modules/SpiceBot_Restart/Restart.py @@ -8,18 +8,6 @@ import sopel.module from sopel_modules.SpiceBot_SBTools import bot_logging, spicebot_reload -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @sopel.module.nickname_commands('restart') def nickname_comand_restart(bot, trigger): diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py index 4501367..02143f7 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py @@ -10,18 +10,6 @@ from sopel_modules.SpiceBot_SBTools import humanized_time, bot_logging import time -def configure(config): - pass - - -def setup(bot): - pass - - -def shutdown(bot): - pass - - @module.event('001') @module.rule('.*') @module.thread(True) diff --git a/sopel_modules/SpiceBot_Update/Update.py b/sopel_modules/SpiceBot_Update/Update.py index 820cd41..fbd833a 100644 --- a/sopel_modules/SpiceBot_Update/Update.py +++ b/sopel_modules/SpiceBot_Update/Update.py @@ -29,10 +29,6 @@ def setup(bot): bot.config.define_section("SpiceBot_Update", SpiceBot_Update_MainSection, validate=False) -def shutdown(bot): - pass - - @sopel.module.nickname_commands('update') def nickname_comand_update(bot, trigger): diff --git a/sopel_modules/SpiceBot_Uptime/Uptime.py b/sopel_modules/SpiceBot_Uptime/Uptime.py index 81ba858..2dbaf32 100644 --- a/sopel_modules/SpiceBot_Uptime/Uptime.py +++ b/sopel_modules/SpiceBot_Uptime/Uptime.py @@ -11,10 +11,6 @@ from sopel_modules.SpiceBot_SBTools import humanized_time from sopel_modules.SpiceBot_SBTools import bot_logging -def configure(config): - pass - - def setup(bot): if 'SpiceBot_Uptime' not in bot.memory: now = time.time() diff --git a/sopel_modules/SpiceBot_osd/__init__.py b/sopel_modules/SpiceBot_osd/__init__.py index 8c4bbbb..105158a 100644 --- a/sopel_modules/SpiceBot_osd/__init__.py +++ b/sopel_modules/SpiceBot_osd/__init__.py @@ -54,11 +54,6 @@ def setup(bot): bot.config.define_section("MAXTARGCONFIG", MAXTARGCONFIG, validate=False) -def shutdown(bot): - pass - - -# RPL_ISUPPORT = '005' @module.event('005') @module.rule('.*') def parse_event_005(bot, trigger):