diff --git a/sopel_modules/SpiceBot/DictComs.py b/sopel_modules/SpiceBot/DictComs.py index b29b70a..57bed01 100644 --- a/sopel_modules/SpiceBot/DictComs.py +++ b/sopel_modules/SpiceBot/DictComs.py @@ -12,7 +12,7 @@ from .Config import config as botconfig from .Read import read as botread from .Commands import commands as botcommands from .Database import db as botdb -from .Prerun import prerun_shared +from .Tools import prerun_shared import os import copy diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py index 302ba3a..1768e05 100644 --- a/sopel_modules/SpiceBot/Prerun.py +++ b/sopel_modules/SpiceBot/Prerun.py @@ -21,40 +21,7 @@ from .MessageLog import messagelog as botmessagelog from .Config import config as botconfig from .Users import users as botusers from .Events import events as botevents - - -class Botprerun_shared(): - def __init__(self): - - self.valid_hyphen_args = [ - 'check', 'view', - 'count', 'special', - 'enable', 'disable', - 'block', 'unblock', - "activate", "deactivate", - "on", "off", - 'multirun', 'multiruns', - 'example', 'usage', - 'filename', 'filepath', - 'foldername', 'folderpath', - "author", - 'contribs', 'contrib', "contributors", - 'alias', 'aliases', - 'random' - ] - - self.numdict = { - "last": -1 - } - - self.stockoptions = [ - "?default", "validcoms", "contributors", "author", "type", - "filepath", "filename", "hardcoded_channel_block", "description", - "exampleresponse", "example", "usage", "privs" - ] - - -prerun_shared = Botprerun_shared() +from .Tools import prerun_shared def prerun(t_command_type='module', t_command_subtype=None): diff --git a/sopel_modules/SpiceBot/Read.py b/sopel_modules/SpiceBot/Read.py index 051724a..9d37159 100644 --- a/sopel_modules/SpiceBot/Read.py +++ b/sopel_modules/SpiceBot/Read.py @@ -12,7 +12,7 @@ from fake_useragent import UserAgent from .Logs import logs from .Config import config as botconfig -from .Prerun import prerun_shared +from .Tools import prerun_shared class BotRead(): diff --git a/sopel_modules/SpiceBot/Tools.py b/sopel_modules/SpiceBot/Tools.py index 823356d..b47321a 100644 --- a/sopel_modules/SpiceBot/Tools.py +++ b/sopel_modules/SpiceBot/Tools.py @@ -20,6 +20,40 @@ from .Logs import logs from .Config import config as botconfig +class Botprerun_shared(): + def __init__(self): + + self.valid_hyphen_args = [ + 'check', 'view', + 'count', 'special', + 'enable', 'disable', + 'block', 'unblock', + "activate", "deactivate", + "on", "off", + 'multirun', 'multiruns', + 'example', 'usage', + 'filename', 'filepath', + 'foldername', 'folderpath', + "author", + 'contribs', 'contrib', "contributors", + 'alias', 'aliases', + 'random' + ] + + self.numdict = { + "last": -1 + } + + self.stockoptions = [ + "?default", "validcoms", "contributors", "author", "type", + "filepath", "filename", "hardcoded_channel_block", "description", + "exampleresponse", "example", "usage", "privs" + ] + + +prerun_shared = Botprerun_shared() + + """Variable References""" github_dict = {