Remove usage of loop arg in calls to start_adding_reactions (#3644)

* fix stacklevels of warnings

* stop using loop arg when calling start_adding_reactions

* [Audio] Stop using loop arg when calling start_adding_reactions
This commit is contained in:
jack1142 2020-03-20 20:44:57 +01:00 committed by GitHub
parent 5074f2dbab
commit eebea59fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 8 deletions

View File

@ -2001,7 +2001,7 @@ class Audio(commands.Cog):
with contextlib.suppress(discord.HTTPException): with contextlib.suppress(discord.HTTPException):
await eq_message.add_reaction("\N{INFORMATION SOURCE}") await eq_message.add_reaction("\N{INFORMATION SOURCE}")
else: else:
start_adding_reactions(eq_message, reactions, self.bot.loop) start_adding_reactions(eq_message, reactions)
eq_msg_with_reacts = await ctx.fetch_message(eq_message.id) eq_msg_with_reacts = await ctx.fetch_message(eq_message.id)
player.store("eq_message", eq_msg_with_reacts) player.store("eq_message", eq_msg_with_reacts)
@ -2605,7 +2605,7 @@ class Audio(commands.Cog):
if not player.queue: if not player.queue:
expected = ("", "") expected = ("", "")
if player.current: if player.current:
task = start_adding_reactions(message, expected[:4], ctx.bot.loop) task = start_adding_reactions(message, expected[:4])
else: else:
task = None task = None
@ -6334,7 +6334,7 @@ class Audio(commands.Cog):
expected = ("", "") expected = ("", "")
emoji = {"stop": "", "pause": ""} emoji = {"stop": "", "pause": ""}
if player.current: if player.current:
task = start_adding_reactions(message, expected[:4], ctx.bot.loop) task = start_adding_reactions(message, expected[:4])
else: else:
task = None task = None

View File

@ -1286,7 +1286,7 @@ class Downloader(commands.Cog):
query: discord.Message = await ctx.send(message) query: discord.Message = await ctx.send(message)
if can_react: if can_react:
# noinspection PyAsyncCall # noinspection PyAsyncCall
start_adding_reactions(query, ReactionPredicate.YES_OR_NO_EMOJIS, ctx.bot.loop) start_adding_reactions(query, ReactionPredicate.YES_OR_NO_EMOJIS)
pred = ReactionPredicate.yes_or_no(query, ctx.author) pred = ReactionPredicate.yes_or_no(query, ctx.author)
event = "reaction_add" event = "reaction_add"
else: else:

View File

@ -645,7 +645,7 @@ class Permissions(commands.Cog):
if ctx.guild is None or ctx.guild.me.permissions_in(ctx.channel).add_reactions: if ctx.guild is None or ctx.guild.me.permissions_in(ctx.channel).add_reactions:
msg = await ctx.send(_("Are you sure?")) msg = await ctx.send(_("Are you sure?"))
# noinspection PyAsyncCall # noinspection PyAsyncCall
task = start_adding_reactions(msg, ReactionPredicate.YES_OR_NO_EMOJIS, ctx.bot.loop) task = start_adding_reactions(msg, ReactionPredicate.YES_OR_NO_EMOJIS)
pred = ReactionPredicate.yes_or_no(msg, ctx.author) pred = ReactionPredicate.yes_or_no(msg, ctx.author)
try: try:
await ctx.bot.wait_for("reaction_add", check=pred, timeout=30) await ctx.bot.wait_for("reaction_add", check=pred, timeout=30)

View File

@ -56,6 +56,7 @@ def is_mod_or_superior(ctx: "Context") -> Awaitable[bool]:
"`redbot.core.checks.is_mod_or_superior` is deprecated and will be removed in a future " "`redbot.core.checks.is_mod_or_superior` is deprecated and will be removed in a future "
"release, please use `redbot.core.utils.mod.is_mod_or_superior` instead.", "release, please use `redbot.core.utils.mod.is_mod_or_superior` instead.",
category=DeprecationWarning, category=DeprecationWarning,
stacklevel=2,
) )
return _is_mod_or_superior(ctx.bot, ctx.author) return _is_mod_or_superior(ctx.bot, ctx.author)
@ -65,6 +66,7 @@ def is_admin_or_superior(ctx: "Context") -> Awaitable[bool]:
"`redbot.core.checks.is_admin_or_superior` is deprecated and will be removed in a future " "`redbot.core.checks.is_admin_or_superior` is deprecated and will be removed in a future "
"release, please use `redbot.core.utils.mod.is_admin_or_superior` instead.", "release, please use `redbot.core.utils.mod.is_admin_or_superior` instead.",
category=DeprecationWarning, category=DeprecationWarning,
stacklevel=2,
) )
return _is_admin_or_superior(ctx.bot, ctx.author) return _is_admin_or_superior(ctx.bot, ctx.author)
@ -72,6 +74,8 @@ def is_admin_or_superior(ctx: "Context") -> Awaitable[bool]:
def check_permissions(ctx: "Context", perms: Dict[str, bool]) -> Awaitable[bool]: def check_permissions(ctx: "Context", perms: Dict[str, bool]) -> Awaitable[bool]:
warnings.warn( warnings.warn(
"`redbot.core.checks.check_permissions` is deprecated and will be removed in a future " "`redbot.core.checks.check_permissions` is deprecated and will be removed in a future "
"release, please use `redbot.core.utils.mod.check_permissions`." "release, please use `redbot.core.utils.mod.check_permissions`.",
DeprecationWarning,
stacklevel=2,
) )
return _check_permissions(ctx, perms) return _check_permissions(ctx, perms)

View File

@ -183,6 +183,7 @@ def bounded_gather_iter(
"Explicitly passing the loop will not work in Red 3.4+ and is currently ignored." "Explicitly passing the loop will not work in Red 3.4+ and is currently ignored."
"Call this from the related event loop.", "Call this from the related event loop.",
DeprecationWarning, DeprecationWarning,
stacklevel=2,
) )
loop = asyncio.get_running_loop() loop = asyncio.get_running_loop()
@ -240,6 +241,7 @@ def bounded_gather(
"Explicitly passing the loop will not work in Red 3.4+ and is currently ignored." "Explicitly passing the loop will not work in Red 3.4+ and is currently ignored."
"Call this from the related event loop.", "Call this from the related event loop.",
DeprecationWarning, DeprecationWarning,
stacklevel=2,
) )
loop = asyncio.get_running_loop() loop = asyncio.get_running_loop()

View File

@ -78,7 +78,7 @@ async def menu(
message = await ctx.send(current_page) message = await ctx.send(current_page)
# Don't wait for reactions to be added (GH-1797) # Don't wait for reactions to be added (GH-1797)
# noinspection PyAsyncCall # noinspection PyAsyncCall
start_adding_reactions(message, controls.keys(), ctx.bot.loop) start_adding_reactions(message, controls.keys())
else: else:
try: try:
if isinstance(current_page, discord.Embed): if isinstance(current_page, discord.Embed):
@ -213,7 +213,11 @@ def start_adding_reactions(
if loop is None: if loop is None:
loop = asyncio.get_running_loop() loop = asyncio.get_running_loop()
else: else:
warnings.warn("Explicitly passing the loop will not work in Red 3.4+", DeprecationWarning) warnings.warn(
"Explicitly passing the loop will not work in Red 3.4+",
DeprecationWarning,
stacklevel=2,
)
return loop.create_task(task()) return loop.create_task(task())