diff --git a/sopel_modules/SpiceBot_SBTools/__init__.py b/sopel_modules/SpiceBot/Tools.py similarity index 99% rename from sopel_modules/SpiceBot_SBTools/__init__.py rename to sopel_modules/SpiceBot/Tools.py index 74c7a3c..29f1515 100644 --- a/sopel_modules/SpiceBot_SBTools/__init__.py +++ b/sopel_modules/SpiceBot/Tools.py @@ -20,7 +20,7 @@ from pygit2 import clone_repository import spicemanip -from sopel_modules.SpiceBot.Logs import botlogs +from .Logs import botlogs """Variable References""" diff --git a/sopel_modules/SpiceBot/__init__.py b/sopel_modules/SpiceBot/__init__.py index e934cff..f0567d6 100644 --- a/sopel_modules/SpiceBot/__init__.py +++ b/sopel_modules/SpiceBot/__init__.py @@ -6,6 +6,7 @@ These are the core SpiceBot Classes This module contains references only for other modules to utilize. """ +from .Tools import * from .Logs import * from .Events import * from .Channels import * diff --git a/sopel_modules/SpiceBot_AI/AI.py b/sopel_modules/SpiceBot_AI/AI.py index 0a3f8f1..4e8e340 100644 --- a/sopel_modules/SpiceBot_AI/AI.py +++ b/sopel_modules/SpiceBot_AI/AI.py @@ -6,7 +6,7 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, googlesearch, bot_privs, inlist, inlist_match, similar_list +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, googlesearch, bot_privs, inlist, inlist_match, similar_list from sopel_modules.SpiceBot.Events import botevents diff --git a/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py b/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py index 50dce5c..54a3aa8 100644 --- a/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py +++ b/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py @@ -6,7 +6,7 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, bot_privs +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, bot_privs @sopel.module.nickname_commands('owners', 'owner') diff --git a/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py b/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py index 24825c8..ce8004e 100644 --- a/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py +++ b/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py @@ -8,7 +8,7 @@ import spicemanip from sopel_modules.SpiceBot.Events import botevents from sopel_modules.SpiceBot.Channels import botchannels -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, inlist, channel_privs +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, inlist, channel_privs @botevents.check_ready([botevents.BOT_LOADED]) diff --git a/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py b/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py index a04866f..9932600 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py +++ b/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py @@ -6,7 +6,7 @@ import sopel import sopel.module from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, similar_list, letters_in_string +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, similar_list, letters_in_string import spicemanip diff --git a/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py b/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py index f2e6de1..794b006 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py +++ b/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py @@ -6,7 +6,7 @@ import sopel import sopel.module from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, similar_list, letters_in_string +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, similar_list, letters_in_string import spicemanip diff --git a/sopel_modules/SpiceBot_Docs/Docs.py b/sopel_modules/SpiceBot_Docs/Docs.py index c8e496a..2924142 100644 --- a/sopel_modules/SpiceBot_Docs/Docs.py +++ b/sopel_modules/SpiceBot_Docs/Docs.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot_SBTools import github_dict +from sopel_modules.SpiceBot.Tools import github_dict @sopel.module.nickname_commands('help', 'docs', 'wiki') diff --git a/sopel_modules/SpiceBot_GifSearch/gif.py b/sopel_modules/SpiceBot_GifSearch/gif.py index 88c5566..03ade90 100644 --- a/sopel_modules/SpiceBot_GifSearch/gif.py +++ b/sopel_modules/SpiceBot_GifSearch/gif.py @@ -6,7 +6,7 @@ from sopel import module from .gifsearch import getGif -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs +from sopel_modules.SpiceBot.Tools import sopel_triggerargs from sopel_modules.SpiceBot.Events import botevents import spicemanip diff --git a/sopel_modules/SpiceBot_GifSearch/gifapi.py b/sopel_modules/SpiceBot_GifSearch/gifapi.py index 5fcd73e..10c5866 100644 --- a/sopel_modules/SpiceBot_GifSearch/gifapi.py +++ b/sopel_modules/SpiceBot_GifSearch/gifapi.py @@ -8,7 +8,7 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs +from sopel_modules.SpiceBot.Tools import sopel_triggerargs from sopel_modules.SpiceBot.Events import botevents diff --git a/sopel_modules/SpiceBot_GifSearch/gifsearch.py b/sopel_modules/SpiceBot_GifSearch/gifsearch.py index 1eb2ce4..2b3a25e 100644 --- a/sopel_modules/SpiceBot_GifSearch/gifsearch.py +++ b/sopel_modules/SpiceBot_GifSearch/gifsearch.py @@ -8,7 +8,7 @@ from sopel.config.types import StaticSection, ValidatedAttribute from sopel_modules.SpiceBot.Logs import botlogs from sopel_modules.SpiceBot.Events import botevents from sopel_modules.SpiceBot_CommandsQuery.CommandsQuery import commandsquery_register -from sopel_modules.SpiceBot_SBTools import read_directory_json_to_dict +from sopel_modules.SpiceBot.Tools import read_directory_json_to_dict import spicemanip diff --git a/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py b/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py index 3bff3a2..732a976 100644 --- a/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py +++ b/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs +from sopel_modules.SpiceBot.Tools import sopel_triggerargs from sopel_modules.SpiceBot.Events import botevents diff --git a/sopel_modules/SpiceBot_Logs/Logs_Command.py b/sopel_modules/SpiceBot_Logs/Logs_Command.py index 7c6bf5f..a63b8c4 100644 --- a/sopel_modules/SpiceBot_Logs/Logs_Command.py +++ b/sopel_modules/SpiceBot_Logs/Logs_Command.py @@ -7,7 +7,7 @@ import spicemanip from sopel_modules.SpiceBot.Logs import botlogs from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, inlist, inlist_match, similar_list +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, command_permissions_check, inlist, inlist_match, similar_list @botevents.check_ready([botevents.BOT_LOGS]) diff --git a/sopel_modules/SpiceBot_Messaging/Messaging.py b/sopel_modules/SpiceBot_Messaging/Messaging.py index 0921c8a..609f2f1 100644 --- a/sopel_modules/SpiceBot_Messaging/Messaging.py +++ b/sopel_modules/SpiceBot_Messaging/Messaging.py @@ -7,7 +7,7 @@ import sopel.module import spicemanip from sopel_modules.SpiceBot.Channels import botchannels -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, inlist +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, command_permissions_check, inlist @sopel.module.nickname_commands('action') diff --git a/sopel_modules/SpiceBot_Restart/Restart.py b/sopel_modules/SpiceBot_Restart/Restart.py index 89e083c..608f9bc 100644 --- a/sopel_modules/SpiceBot_Restart/Restart.py +++ b/sopel_modules/SpiceBot_Restart/Restart.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi import sopel.module from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot_SBTools import spicebot_reload +from sopel_modules.SpiceBot.Tools import spicebot_reload @sopel.module.nickname_commands('restart') diff --git a/sopel_modules/SpiceBot_SopelPatches/Patches.py b/sopel_modules/SpiceBot_SopelPatches/Patches.py index 0aa3cc8..2a00d35 100644 --- a/sopel_modules/SpiceBot_SopelPatches/Patches.py +++ b/sopel_modules/SpiceBot_SopelPatches/Patches.py @@ -7,7 +7,7 @@ import sopel import sopel.module from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot_SBTools import stock_modules_begone +from sopel_modules.SpiceBot.Tools import stock_modules_begone def setup(bot): diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py index a5ab12b..7941f57 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py @@ -6,7 +6,7 @@ import sopel.module from sopel_modules.SpiceBot.Logs import botlogs from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot_SBTools import humanized_time +from sopel_modules.SpiceBot.Tools import humanized_time import time diff --git a/sopel_modules/SpiceBot_Update/Update.py b/sopel_modules/SpiceBot_Update/Update.py index d00464d..0d7e666 100644 --- a/sopel_modules/SpiceBot_Update/Update.py +++ b/sopel_modules/SpiceBot_Update/Update.py @@ -9,7 +9,7 @@ from sopel.config.types import StaticSection, ValidatedAttribute import spicemanip from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, spicebot_reload, spicebot_update +from sopel_modules.SpiceBot.Tools import sopel_triggerargs, command_permissions_check, spicebot_reload, spicebot_update class SpiceBot_Update_MainSection(StaticSection): diff --git a/sopel_modules/SpiceBot_Uptime/Uptime.py b/sopel_modules/SpiceBot_Uptime/Uptime.py index 3af0b71..067f796 100644 --- a/sopel_modules/SpiceBot_Uptime/Uptime.py +++ b/sopel_modules/SpiceBot_Uptime/Uptime.py @@ -7,7 +7,7 @@ import sopel.module import time from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot_SBTools import humanized_time +from sopel_modules.SpiceBot.Tools import humanized_time def setup(bot):