diff --git a/src/__main__.py b/src/__main__.py index 5472b32..e570073 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -25,7 +25,7 @@ formatter = logging.Formatter(log_format, style='{', datefmt=date_format) console_handler.setFormatter(formatter) logging.getLogger('').addHandler(console_handler) -config_dir = 'config/' +config_dir = 'src/config/' admin_id_file = 'admin_ids' extension_dir = 'exts' owner_id = 351794468870946827 @@ -101,12 +101,12 @@ class Geeksbot(commands.Bot): message.guild.id) or bot_inst.default_prefix async def load_ext(self, ctx, mod=None): - self.load_extension('{0}.{1}'.format(extension_dir, mod)) + self.load_extension('src.{0}.{1}'.format(extension_dir, mod)) if ctx is not None: await ctx.send('{0} loaded.'.format(mod)) async def unload_ext(self, ctx, mod=None): - self.unload_extension('{0}.{1}'.format(extension_dir, mod)) + self.unload_extension('src.{0}.{1}'.format(extension_dir, mod)) if ctx is not None: await ctx.send('{0} unloaded.'.format(mod)) diff --git a/src/exts/admin.py b/src/exts/admin.py index e812e46..0c38e45 100644 --- a/src/exts/admin.py +++ b/src/exts/admin.py @@ -4,7 +4,7 @@ import json import logging import inspect import os -from .imports import checks, utils +from src.imports import checks, utils config_dir = 'config/' admin_id_file = 'admin_ids' diff --git a/src/exts/events.py b/src/exts/events.py index d9cd810..0ae4e95 100644 --- a/src/exts/events.py +++ b/src/exts/events.py @@ -4,7 +4,7 @@ import logging from datetime import datetime import json import re -from .imports import utils +from src.imports import utils config_dir = 'config/' admin_id_file = 'admin_ids' diff --git a/src/exts/git.py b/src/exts/git.py index 3d43859..056ffd9 100644 --- a/src/exts/git.py +++ b/src/exts/git.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands import logging -from .imports.utils import Paginator, run_command +from src.imports import Paginator, run_command import asyncio owner_id = 351794468870946827 diff --git a/src/exts/patreon.py b/src/exts/patreon.py index da82edb..9258d34 100644 --- a/src/exts/patreon.py +++ b/src/exts/patreon.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands import json -from .imports import checks +from src.imports import checks config_dir = 'config' extension_dir = 'extensions' diff --git a/src/exts/rcon.py b/src/exts/rcon.py index ccbe593..9dbf001 100644 --- a/src/exts/rcon.py +++ b/src/exts/rcon.py @@ -7,7 +7,7 @@ import logging from datetime import datetime import asyncio import traceback -from .imports import checks +from src.imports import checks config_dir = 'config' admin_id_file = 'admin_ids' diff --git a/src/exts/repl.py b/src/exts/repl.py index aa4078c..40943f5 100644 --- a/src/exts/repl.py +++ b/src/exts/repl.py @@ -7,7 +7,7 @@ import inspect import textwrap from contextlib import redirect_stdout import io -from .imports.utils import run_command, format_output, Paginator +from src.imports import run_command, format_output, Paginator ownerids = [351794468870946827, 275280442884751360] ownerid = 351794468870946827 diff --git a/src/exts/utils.py b/src/exts/utils.py index 0f7fcbb..bf506bb 100644 --- a/src/exts/utils.py +++ b/src/exts/utils.py @@ -7,7 +7,7 @@ import psutil from datetime import datetime, timedelta import asyncio import async_timeout -from .imports import checks, utils +from src.imports import checks, utils import pytz import gspread from oauth2client.service_account import ServiceAccountCredentials diff --git a/src/exts/imports/__init__.py b/src/imports/__init__.py similarity index 100% rename from src/exts/imports/__init__.py rename to src/imports/__init__.py diff --git a/src/exts/imports/checks.py b/src/imports/checks.py similarity index 100% rename from src/exts/imports/checks.py rename to src/imports/checks.py diff --git a/src/exts/imports/utils.py b/src/imports/utils.py similarity index 99% rename from src/exts/imports/utils.py rename to src/imports/utils.py index 0f77055..27c0674 100644 --- a/src/exts/imports/utils.py +++ b/src/imports/utils.py @@ -3,8 +3,8 @@ import sys import asyncio import discord from discord.ext.commands.formatter import Paginator as DannyPag -from . import checks -from geeksbot_dev.geeksbot import Geeksbot +from src.imports import checks +from src.__main__ import Geeksbot import re import typing