Merge pull request #93 from classabbyamp/data-imports-fix

fix data imports
This commit is contained in:
Abigail Gold 2019-12-08 02:57:09 -05:00 committed by GitHub
commit 72d724af04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -17,7 +17,7 @@ import discord.ext.commands as commands
import info import info
from data import options as opt import data.options as opt
import common as cmn import common as cmn

View File

@ -84,7 +84,7 @@ class HamCog(commands.Cog):
if country.lower() not in callsign_info.options: if country.lower() not in callsign_info.options:
embed = discord.Embed(title=f'{country} not found!', embed = discord.Embed(title=f'{country} not found!',
description=f'Valid countries: {", ".join(callsign_info.options.keys())}', description=f'Valid countries: {", ".join(callsign_info.options.keys())}',
colour=self.gs.colours.bad, colour=cmn.colours.bad,
timestamp=datetime.utcnow()) timestamp=datetime.utcnow())
embed.set_footer(text=ctx.author.name, embed.set_footer(text=ctx.author.name,
icon_url=str(ctx.author.avatar_url)) icon_url=str(ctx.author.avatar_url))
@ -92,7 +92,7 @@ class HamCog(commands.Cog):
return return
embed = discord.Embed(title=callsign_info.options[country.lower()][0], embed = discord.Embed(title=callsign_info.options[country.lower()][0],
description=callsign_info.options[country.lower()][1], description=callsign_info.options[country.lower()][1],
colour=self.gs.colours.good, colour=cmn.colours.good,
timestamp=datetime.utcnow()) timestamp=datetime.utcnow())
embed.set_footer(text=ctx.author.name, embed.set_footer(text=ctx.author.name,
icon_url=str(ctx.author.avatar_url)) icon_url=str(ctx.author.avatar_url))

View File

@ -17,7 +17,7 @@ import aiohttp
from lxml import etree from lxml import etree
import common as cmn import common as cmn
import keys import data.keys as keys
class QRZCog(commands.Cog): class QRZCog(commands.Cog):

View File

@ -17,8 +17,8 @@ from discord.ext import commands, tasks
import common as cmn import common as cmn
import info import info
from data import options as opt import data.options as opt
from data import keys import data.keys as keys
# --- Settings --- # --- Settings ---