Skip to content

Commit

Permalink
Merge branch 'V3/develop' into V3/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
BenCos17 authored Nov 20, 2024
2 parents 496e58d + 33e0eac commit b331f22
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
9 changes: 0 additions & 9 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ unsafe-load-any-extension=no
# run arbitrary code
extension-pkg-whitelist=

# Allow optimization of some AST trees. This will activate a peephole AST
# optimizer, which will apply various small optimizations. For instance, it can
# be used to obtain the result of joining multiple strings with the addition
# operator. Joining a lot of strings can lead to a maximum recursion error in
# Pylint and this flag can prevent that. It has one side effect, the resulting
# AST will be different than the one from reality.
optimize-ast=no


[MESSAGES CONTROL]

Expand Down Expand Up @@ -66,7 +58,6 @@ disable=C, # black is enforcing this for us already, incompatibly
[REPORTS]

output-format=parseable
files-output=no
reports=no


Expand Down
3 changes: 1 addition & 2 deletions redbot/core/utils/menus.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,12 @@ async def control_no(*args, **kwargs):
# where the original message is already sent prior to starting.
# This is not normally the way we recommend sending this because
# internally we already include the emojis we expect.
view = SimpleMenu(pages, timeout=timeout)
if controls == DEFAULT_CONTROLS:
view = SimpleMenu(pages, timeout=timeout)
await view.start(ctx, user=user)
await view.wait()
return
else:
view = SimpleMenu(pages, timeout=timeout)
view.remove_item(view.last_button)
view.remove_item(view.first_button)
has_next = False
Expand Down

0 comments on commit b331f22

Please sign in to comment.