Breaking more stuff

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))
 

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'

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'

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

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'

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'

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

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

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