CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-21 18:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

[V3 Travis] Update travis to not skip pipfile lock... (#1678)

Browse Source 
* Update travis to not sip pipfile lock

update pipfile dependencies

additional black formatting pass to conform to black 18.5b

* .

* pin async timeout until further discussion of 3.5 support

* .
This commit is contained in:
Michael H
2018-05-18 21:48:22 -04:00
committed by palmtree5
parent 55afc7eb33
commit d3f406a34a
35 changed files with 214 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
redbot/cogs/trivia/session.py
View File

@@ -19,7 +19,7 @@ _FAIL_MESSAGES = (
)
class TriviaSession():
class TriviaSession:
"""Class to run a session of trivia with the user.
To run the trivia session immediately, use `TriviaSession.start` instead of
@@ -127,7 +127,7 @@ class TriviaSession():
num_lists = len(list_names)
if num_lists > 2:
# at least 3 lists, join all but last with comma
msg = ", ".join(list_names[:num_lists - 1])
msg = ", ".join(list_names[: num_lists - 1])
# join onto last with "and"
msg = " and ".join((msg, list_names[num_lists - 1]))
else:
@@ -216,9 +216,7 @@ class TriviaSession():
answers = tuple(s.lower() for s in answers)
def _pred(message: discord.Message):
early_exit = (
message.channel != self.ctx.channel or message.author == self.ctx.guild.me
)
early_exit = message.channel != self.ctx.channel or message.author == self.ctx.guild.me
if early_exit:
return False