From 521c99a6147ec708716d0978ce37c5e9d654aa8f Mon Sep 17 00:00:00 2001
From: Abigail Gold <dev@kb6.ee>
Date: Sat, 7 Dec 2019 17:13:06 -0500
Subject: [PATCH] fix imports. Fixes #85

---
 cogs/basecog.py | 2 +-
 cogs/hamcog.py  | 4 ++--
 cogs/qrzcog.py  | 2 +-
 main.py         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cogs/basecog.py b/cogs/basecog.py
index 290a8cd..65c2d16 100644
--- a/cogs/basecog.py
+++ b/cogs/basecog.py
@@ -17,7 +17,7 @@ import discord.ext.commands as commands
 
 import info
 
-from data import options as opt
+import data.options as opt
 import common as cmn
 
 
diff --git a/cogs/hamcog.py b/cogs/hamcog.py
index 58ede8e..90113e1 100644
--- a/cogs/hamcog.py
+++ b/cogs/hamcog.py
@@ -84,7 +84,7 @@ class HamCog(commands.Cog):
         if country.lower() not in callsign_info.options:
             embed = discord.Embed(title=f'{country} not found!',
                                   description=f'Valid countries: {", ".join(callsign_info.options.keys())}',
-                                  colour=self.gs.colours.bad,
+                                  colour=cmn.colours.bad,
                                   timestamp=datetime.utcnow())
             embed.set_footer(text=ctx.author.name,
                              icon_url=str(ctx.author.avatar_url))
@@ -92,7 +92,7 @@ class HamCog(commands.Cog):
             return
         embed = discord.Embed(title=callsign_info.options[country.lower()][0],
                               description=callsign_info.options[country.lower()][1],
-                              colour=self.gs.colours.good,
+                              colour=cmn.colours.good,
                               timestamp=datetime.utcnow())
         embed.set_footer(text=ctx.author.name,
                          icon_url=str(ctx.author.avatar_url))
diff --git a/cogs/qrzcog.py b/cogs/qrzcog.py
index 1a18a94..caaf530 100644
--- a/cogs/qrzcog.py
+++ b/cogs/qrzcog.py
@@ -17,7 +17,7 @@ import aiohttp
 from lxml import etree
 
 import common as cmn
-import keys
+import data.keys as keys
 
 
 class QRZCog(commands.Cog):
diff --git a/main.py b/main.py
index 449dc4a..65c2a16 100644
--- a/main.py
+++ b/main.py
@@ -17,8 +17,8 @@ from discord.ext import commands, tasks
 import common as cmn
 import info
 
-from data import options as opt
-from data import keys
+import data.options as opt
+import data.keys as keys
 
 
 # --- Settings ---