From 330fa16970046e5a2a15f43c018e79dc3fc67d7f Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Tue, 21 Aug 2018 15:36:51 -0500 Subject: [PATCH] Fixed imports for modules --- geoffrey/Commands.py | 2 +- geoffrey/DatabaseInterface.py | 2 +- geoffrey/DatabaseModels.py | 6 +++--- geoffrey/DiscordHelperFunctions.py | 2 +- geoffrey/Geoffrey.py | 4 ++-- geoffrey/MinecraftAccountInfoGrabber.py | 2 +- geoffrey/bot.py | 10 +++++----- geoffrey/cogs/Add_Commands.py | 6 +++--- geoffrey/cogs/Admin_Commands.py | 6 +++--- geoffrey/cogs/Delete_Commands.py | 6 +++--- geoffrey/cogs/Edit_Commands.py | 6 +++--- geoffrey/cogs/Search_Commands.py | 6 +++--- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/geoffrey/Commands.py b/geoffrey/Commands.py index dd81d94..bb9ff53 100644 --- a/geoffrey/Commands.py +++ b/geoffrey/Commands.py @@ -1,4 +1,4 @@ -from DatabaseInterface import * +from geoffrey.DatabaseInterface import * class Commands: diff --git a/geoffrey/DatabaseInterface.py b/geoffrey/DatabaseInterface.py index 06fad0f..4a2131f 100644 --- a/geoffrey/DatabaseInterface.py +++ b/geoffrey/DatabaseInterface.py @@ -1,4 +1,4 @@ -from DatabaseModels import * +from geoffrey.DatabaseModels import * class DatabaseInterface: diff --git a/geoffrey/DatabaseModels.py b/geoffrey/DatabaseModels.py index 1e41f08..3ff660b 100644 --- a/geoffrey/DatabaseModels.py +++ b/geoffrey/DatabaseModels.py @@ -7,9 +7,9 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import relationship, column_property, sessionmaker from sqlalchemy.sql import expression -from BotConfig import bot_config -from BotErrors import * -from MinecraftAccountInfoGrabber import * +from geoffrey.BotConfig import bot_config +from geoffrey.BotErrors import * +from geoffrey.MinecraftAccountInfoGrabber import * SQL_Base = declarative_base() diff --git a/geoffrey/DiscordHelperFunctions.py b/geoffrey/DiscordHelperFunctions.py index 918a3e0..6110150 100644 --- a/geoffrey/DiscordHelperFunctions.py +++ b/geoffrey/DiscordHelperFunctions.py @@ -1,6 +1,6 @@ from itertools import zip_longest -from BotConfig import bot_config +from geoffrey.BotConfig import bot_config def get_name(args): diff --git a/geoffrey/Geoffrey.py b/geoffrey/Geoffrey.py index 37f4e04..e125d98 100644 --- a/geoffrey/Geoffrey.py +++ b/geoffrey/Geoffrey.py @@ -8,8 +8,8 @@ import logging import logging.handlers as handlers from sys import stdout -import bot -from BotConfig import bot_config +from geoffrey import bot +from geoffrey.BotConfig import bot_config def setup_logging(): diff --git a/geoffrey/MinecraftAccountInfoGrabber.py b/geoffrey/MinecraftAccountInfoGrabber.py index 73553f1..1dc9cab 100644 --- a/geoffrey/MinecraftAccountInfoGrabber.py +++ b/geoffrey/MinecraftAccountInfoGrabber.py @@ -2,7 +2,7 @@ from json import JSONDecodeError import requests -from BotErrors import UsernameLookupFailed +from geoffrey.BotErrors import UsernameLookupFailed uuid_lookup_url = 'https://api.mojang.com/users/profiles/minecraft/{}' username_lookup_url = 'https://api.mojang.com/user/profiles/{}/names' diff --git a/geoffrey/bot.py b/geoffrey/bot.py index afad3e6..f976ff9 100644 --- a/geoffrey/bot.py +++ b/geoffrey/bot.py @@ -6,11 +6,11 @@ from discord.ext import commands from discord.utils import oauth_url from sqlalchemy.exc import OperationalError -from BotConfig import bot_config -from BotErrors import * -from Commands import Commands -from DatabaseModels import Player -from MinecraftAccountInfoGrabber import * +from geoffrey.BotConfig import bot_config +from geoffrey.BotErrors import * +from geoffrey.Commands import Commands +from geoffrey.DatabaseModels import Player +from geoffrey.MinecraftAccountInfoGrabber import * logger = logging.getLogger(__name__) diff --git a/geoffrey/cogs/Add_Commands.py b/geoffrey/cogs/Add_Commands.py index 5e66666..8344ead 100644 --- a/geoffrey/cogs/Add_Commands.py +++ b/geoffrey/cogs/Add_Commands.py @@ -1,8 +1,8 @@ from discord.ext import commands -from BotErrors import * -from DiscordHelperFunctions import * -from bot import bot_commands +from geoffrey.BotErrors import * +from geoffrey.DiscordHelperFunctions import * +from geoffrey.bot import bot_commands @commands.cooldown(5, 60, commands.BucketType.user) diff --git a/geoffrey/cogs/Admin_Commands.py b/geoffrey/cogs/Admin_Commands.py index 890b82a..71d3964 100644 --- a/geoffrey/cogs/Admin_Commands.py +++ b/geoffrey/cogs/Admin_Commands.py @@ -1,9 +1,9 @@ from discord import Game from discord.ext import commands -from BotConfig import bot_config -from BotErrors import * -from bot import bot_commands +from geoffrey.BotConfig import bot_config +from geoffrey.BotErrors import * +from geoffrey.bot import bot_commands def check_mod(user): diff --git a/geoffrey/cogs/Delete_Commands.py b/geoffrey/cogs/Delete_Commands.py index e26ff27..9bc0ebd 100644 --- a/geoffrey/cogs/Delete_Commands.py +++ b/geoffrey/cogs/Delete_Commands.py @@ -1,8 +1,8 @@ from discord.ext import commands -from BotErrors import * -from DiscordHelperFunctions import * -from bot import bot_commands +from geoffrey.BotErrors import * +from geoffrey.DiscordHelperFunctions import * +from geoffrey.bot import bot_commands class Delete_Commands: diff --git a/geoffrey/cogs/Edit_Commands.py b/geoffrey/cogs/Edit_Commands.py index b9ddf3f..d622d9e 100644 --- a/geoffrey/cogs/Edit_Commands.py +++ b/geoffrey/cogs/Edit_Commands.py @@ -1,8 +1,8 @@ from discord.ext import commands -from BotErrors import * -from DiscordHelperFunctions import * -from bot import bot_commands +from geoffrey.BotErrors import * +from geoffrey.DiscordHelperFunctions import * +from geoffrey.bot import bot_commands class Edit_Commands: diff --git a/geoffrey/cogs/Search_Commands.py b/geoffrey/cogs/Search_Commands.py index 46f192c..186030f 100644 --- a/geoffrey/cogs/Search_Commands.py +++ b/geoffrey/cogs/Search_Commands.py @@ -1,8 +1,8 @@ from discord.ext import commands -from BotErrors import * -from DiscordHelperFunctions import * -from bot import bot_commands +from geoffrey.BotErrors import * +from geoffrey.DiscordHelperFunctions import * +from geoffrey.bot import bot_commands class Search_Commands: