marcothms/aquabot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove useless loaddata.py

Browse Source
This commit is contained in:
Marco Thomas
2020-09-12 00:11:50 +02:00
parent dcf57199bf
commit 522c0ecf52
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cogs/meme.py
View File

@@ -8,7 +8,7 @@ from discord.ext import commands
import random import random
# IMPORTS - internal # IMPORTS - internal
import loaddata import memes
# COG INIT # COG INIT
class Meme(commands.Cog): class Meme(commands.Cog):
@@ -25,7 +25,7 @@ class Meme(commands.Cog):
if query == "List": if query == "List":
meme_list = "" meme_list = ""
for key in loaddata.__memes_list__.keys(): for key in memes.__memes_list__.keys():
if not meme_list: if not meme_list:
meme_list = meme_list + key meme_list = meme_list + key
else: else:
@@ -34,7 +34,7 @@ class Meme(commands.Cog):
await ctx.send(f"Currently listed memes: `{meme_list}`") await ctx.send(f"Currently listed memes: `{meme_list}`")
else: else:
try: try:
meme = random.choice(loaddata.__memes_list__[query]) meme = random.choice(memes.__memes_list__[query])
await ctx.send(meme) await ctx.send(meme)
except KeyError as e: except KeyError as e:
await ctx.send("Meme not found in database") await ctx.send("Meme not found in database")

10
loaddata.py
View File

@@ -1,10 +0,0 @@
"""
Gather all media data into one file,
so all other files can call it from here
"""
try:
from memes import __memes_list__
except ImportError as error:
print(f"Error while importing: {error}")