Add public positive_int and finite_float converters (#5969)

Co-authored-by: Kreusada <67752638+Kreusada@users.noreply.github.com>

redbot/cogs/cleanup/cleanup.py

@@ -7,13 +7,13 @@ import discord
 
 from redbot.core import commands, Config
 from redbot.core.bot import Red
-from redbot.core.commands import RawUserIdConverter
+from redbot.core.commands import positive_int, RawUserIdConverter
 from redbot.core.i18n import Translator, cog_i18n
 from redbot.core.utils.chat_formatting import humanize_number
 from redbot.core.utils.mod import slow_deletion, mass_purge
 from redbot.core.utils.predicates import MessagePredicate
 from .checks import check_self_permissions
-from .converters import PositiveInt, RawMessageIds, positive_int
+from .converters import RawMessageIds
 
 _ = Translator("Cleanup", __file__)
 
@@ -78,9 +78,9 @@ class Cleanup(commands.Cog):
         channel: Union[
             discord.TextChannel, discord.VoiceChannel, discord.DMChannel, discord.Thread
         ],
-        number: Optional[PositiveInt] = None,
+        number: Optional[int] = None,
         check: Callable[[discord.Message], bool] = lambda x: True,
-        limit: Optional[PositiveInt] = None,
+        limit: Optional[int] = None,
         before: Union[discord.Message, datetime] = None,
         after: Union[discord.Message, datetime] = None,
         delete_pinned: bool = False,
@@ -684,9 +684,7 @@ class Cleanup(commands.Cog):
     @commands.guild_only()
     @commands.mod_or_permissions(manage_messages=True)
     @commands.bot_has_permissions(manage_messages=True)
-    async def cleanup_duplicates(
-        self, ctx: commands.Context, number: positive_int = PositiveInt(50)
-    ):
+    async def cleanup_duplicates(self, ctx: commands.Context, number: positive_int = 50):
         """Deletes duplicate messages in the channel from the last X messages and keeps only one copy.
 
         Defaults to 50.

redbot/cogs/cleanup/converters.py

@@ -1,8 +1,5 @@
-from typing import NewType, TYPE_CHECKING
-
 from redbot.core.commands import BadArgument, Context, Converter
 from redbot.core.i18n import Translator
-from redbot.core.utils.chat_formatting import inline
 
 _ = Translator("Cleanup", __file__)
 
@@ -15,18 +12,3 @@ class RawMessageIds(Converter):
             return int(argument)
 
         raise BadArgument(_("{} doesn't look like a valid message ID.").format(argument))
-
-
-PositiveInt = NewType("PositiveInt", int)
-if TYPE_CHECKING:
-    positive_int = PositiveInt
-else:
-
-    def positive_int(arg: str) -> int:
-        try:
-            ret = int(arg)
-        except ValueError:
-            raise BadArgument(_("{arg} is not an integer.").format(arg=inline(arg)))
-        if ret <= 0:
-            raise BadArgument(_("{arg} is not a positive integer.").format(arg=inline(arg)))
-        return ret

redbot/cogs/economy/converters.py

@@ -1,22 +0,0 @@
-from typing import NewType, TYPE_CHECKING
-
-from redbot.core.commands import BadArgument
-from redbot.core.i18n import Translator
-from redbot.core.utils.chat_formatting import inline
-
-_ = Translator("Economy", __file__)
-
-# Duplicate of redbot.cogs.cleanup.converters.PositiveInt
-PositiveInt = NewType("PositiveInt", int)
-if TYPE_CHECKING:
-    positive_int = PositiveInt
-else:
-
-    def positive_int(arg: str) -> int:
-        try:
-            ret = int(arg)
-        except ValueError:
-            raise BadArgument(_("{arg} is not an integer.").format(arg=inline(arg)))
-        if ret <= 0:
-            raise BadArgument(_("{arg} is not a positive integer.").format(arg=inline(arg)))
-        return ret

redbot/cogs/economy/economy.py

@@ -5,18 +5,17 @@ from collections import defaultdict, deque, namedtuple
 from datetime import datetime, timezone, timedelta
 from enum import Enum
 from math import ceil
-from typing import cast, Iterable, Union, Literal
+from typing import cast, Iterable, Literal
 
 import discord
 
 from redbot.core import Config, bank, commands, errors
-from redbot.core.commands.converter import TimedeltaConverter
+from redbot.core.commands.converter import TimedeltaConverter, positive_int
 from redbot.core.bot import Red
 from redbot.core.i18n import Translator, cog_i18n
 from redbot.core.utils import AsyncIter
 from redbot.core.utils.chat_formatting import box, humanize_number
-from redbot.core.utils.menus import close_menu, menu
-from .converters import positive_int
+from redbot.core.utils.menus import menu
 
 T_ = Translator("Economy", __file__)