lauchmelder/JishoBot
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactored None comparisons

Browse source
This commit is contained in:
Robert 2020-08-12 18:16:50 +02:00
parent 516098d246
commit 4b4af41d8a
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cogs/search.py
View file

@ -91,7 +91,7 @@ class Search(commands.Cog):
@commands.command(name="search", description="Searches Jisho", usage="<query>", aliases=["s"]) @commands.command(name="search", description="Searches Jisho", usage="<query>", aliases=["s"])
@commands.cooldown(1, 5) @commands.cooldown(1, 5)
async def search(self, ctx: commands.Context, *, query: str = None): async def search(self, ctx: commands.Context, *, query: str = None):
if query == None: if query is None:
return return
self.activeObject = JishoObject(query, ctx.author.id) self.activeObject = JishoObject(query, ctx.author.id)

8
utils/jisho.py
View file

@ -134,14 +134,14 @@ class JishoKanji():
# Kun Yomi # Kun Yomi
kun_block = readings_block.findChild("dl", {"class": "dictionary_entry kun_yomi"}, recursive=True) kun_block = readings_block.findChild("dl", {"class": "dictionary_entry kun_yomi"}, recursive=True)
if kun_block != None: if kun_block is not None:
readings = kun_block.findChildren("a", recursive=True) readings = kun_block.findChildren("a", recursive=True)
for reading in readings: for reading in readings:
self.nodes[-1].kun.append(reading.string) self.nodes[-1].kun.append(reading.string)
# On Yomi # On Yomi
on_block = readings_block.findChild("dl", {"class": "dictionary_entry on_yomi"}, recursive=True) on_block = readings_block.findChild("dl", {"class": "dictionary_entry on_yomi"}, recursive=True)
if on_block != None: if on_block is not None:
readings = on_block.findChildren("a", recursive=True) readings = on_block.findChildren("a", recursive=True)
for reading in readings: for reading in readings:
self.nodes[-1].on.append(reading.string) self.nodes[-1].on.append(reading.string)
@ -153,7 +153,7 @@ class JishoKanji():
# JLPT/Grade info # JLPT/Grade info
grade_block = info.findChild("div", {"class": "grade"}, recursive=True) grade_block = info.findChild("div", {"class": "grade"}, recursive=True)
if grade_block != None: if grade_block is not None:
self.nodes[-1].grade = grade_block.findChild("strong").string[-1] self.nodes[-1].grade = grade_block.findChild("strong").string[-1]
self.nodes[-1].jlpt = info.findChild("div", {"class": "jlpt"}, recursive=True).findChild("strong").string self.nodes[-1].jlpt = info.findChild("div", {"class": "jlpt"}, recursive=True).findChild("strong").string
@ -171,5 +171,3 @@ class JishoKanji():
image_url = "https:" + image_url image_url = "https:" + image_url
image_url = image_url.replace("shotai3", "shotai2") image_url = image_url.replace("shotai3", "shotai2")
self.nodes[-1].image_url = image_url self.nodes[-1].image_url = image_url