diff options
author | 2019-09-19 05:49:16 -0700 | |
---|---|---|
committer | 2019-09-19 05:49:16 -0700 | |
commit | f30dcc476a4233eb4785ab0c6996225f3c440caf (patch) | |
tree | 77445ca15692a31043e06647c208304b7aba04d4 | |
parent | Apply suggestions from code review (diff) |
Update paginator defs for correct Optional return
Co-Authored-By: Sebastiaan Zeeff <[email protected]>
-rw-r--r-- | bot/decorators.py | 2 | ||||
-rw-r--r-- | bot/pagination.py | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/bot/decorators.py b/bot/decorators.py index 70482bfa4..c953264b5 100644 --- a/bot/decorators.py +++ b/bot/decorators.py @@ -3,7 +3,7 @@ import random from asyncio import Lock, sleep from contextlib import suppress from functools import wraps -from typing import Any, Callable, Container, Optional, Union +from typing import Any, Callable, Container, Optional from weakref import WeakValueDictionary from discord import Colour, Embed diff --git a/bot/pagination.py b/bot/pagination.py index afdd6b905..473158b3f 100644 --- a/bot/pagination.py +++ b/bot/pagination.py @@ -2,7 +2,7 @@ import asyncio import logging from typing import Iterable, List, Optional, Tuple -from discord import Embed, Member, Reaction +from discord import Embed, Member, Message, Reaction from discord.abc import User from discord.ext.commands import Context, Paginator @@ -86,10 +86,12 @@ class LinePaginator(Paginator): self._count += 1 @classmethod - async def paginate(cls, lines: Iterable[str], ctx: Context, embed: Embed, - prefix: str = "", suffix: str = "", max_lines: Optional[int] = None, max_size: int = 500, - empty: bool = True, restrict_to_user: User = None, timeout: int = 300, - footer_text: str = None, url: str = None, exception_on_empty_embed: bool = False) -> None: + async def paginate( + cls, lines: Iterable[str], ctx: Context, embed: Embed, + prefix: str = "", suffix: str = "", max_lines: Optional[int] = None, max_size: int = 500, + empty: bool = True, restrict_to_user: User = None, timeout: int = 300, + footer_text: str = None, url: str = None, exception_on_empty_embed: bool = False + ) -> Optional[Message]: """ Use a paginator and set of reactions to provide pagination over a set of lines. @@ -301,9 +303,11 @@ class ImagePaginator(Paginator): self.images.append(image) @classmethod - async def paginate(cls, pages: List[Tuple[str, str]], ctx: Context, embed: Embed, - prefix: str = "", suffix: str = "", timeout: int = 300, - exception_on_empty_embed: bool = False) -> Optional[Message]: + async def paginate( + cls, pages: List[Tuple[str, str]], ctx: Context, embed: Embed, + prefix: str = "", suffix: str = "", timeout: int = 300, + exception_on_empty_embed: bool = False + ) -> Optional[Message]: """ Use a paginator and set of reactions to provide pagination over a set of title/image pairs. |