CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 03:08:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential API compatibility issue in parse_timedelta() (#6355)

Browse Source
This commit is contained in:
Jakub Kuczys 2024-04-20 23:42:20 +02:00 committed by GitHub
parent 11ebd40dfa
commit e61327a65c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redbot/core/commands/converter.py
View File

@ -111,7 +111,7 @@ def parse_timedelta(
If provided, any parsed value higher than this will raise an exception If provided, any parsed value higher than this will raise an exception
minimum : Optional[datetime.timedelta] minimum : Optional[datetime.timedelta]
If provided, any parsed value lower than this will raise an exception If provided, any parsed value lower than this will raise an exception
Defaults to 0 seconds, pass None explicitly to allow negative values Defaults to 0 seconds, pass `datetime.timedelta.min` explicitly to allow negative values
allowed_units : Optional[List[str]] allowed_units : Optional[List[str]]
If provided, you can constrain a user to expressing the amount of time If provided, you can constrain a user to expressing the amount of time
in specific units. The units you can chose to provide are the same as the in specific units. The units you can chose to provide are the same as the
@ -135,6 +135,10 @@ def parse_timedelta(
"minutes", "minutes",
"seconds", "seconds",
] ]
if minimum is None:
minimum = timedelta(seconds=0)
if maximum is None:
maximum = timedelta.max
params = _parse_and_match(argument, allowed_units) params = _parse_and_match(argument, allowed_units)
if params: if params:
try: try:
@ -143,13 +147,13 @@ def parse_timedelta(
raise BadArgument( raise BadArgument(
_("The time set is way too high, consider setting something reasonable.") _("The time set is way too high, consider setting something reasonable.")
) )
if maximum and maximum < delta: if maximum < delta:
raise BadArgument( raise BadArgument(
_( _(
"This amount of time is too large for this command. (Maximum: {maximum})" "This amount of time is too large for this command. (Maximum: {maximum})"
).format(maximum=humanize_timedelta(timedelta=maximum)) ).format(maximum=humanize_timedelta(timedelta=maximum))
) )
if minimum and delta < minimum: if delta < minimum:
raise BadArgument( raise BadArgument(
_( _(
"This amount of time is too small for this command. (Minimum: {minimum})" "This amount of time is too small for this command. (Minimum: {minimum})"
@ -334,7 +338,7 @@ else:
If provided, any parsed value higher than this will raise an exception If provided, any parsed value higher than this will raise an exception
minimum : Optional[datetime.timedelta] minimum : Optional[datetime.timedelta]
If provided, any parsed value lower than this will raise an exception If provided, any parsed value lower than this will raise an exception
Defaults to 0 seconds, pass None explicitly to allow negative values Defaults to 0 seconds, pass `datetime.timedelta.min` explicitly to allow negative values
allowed_units : Optional[List[str]] allowed_units : Optional[List[str]]
If provided, you can constrain a user to expressing the amount of time If provided, you can constrain a user to expressing the amount of time
in specific units. The units you can choose to provide are the same as the in specific units. The units you can choose to provide are the same as the
@ -406,7 +410,7 @@ else:
If provided, any parsed value higher than this will raise an exception If provided, any parsed value higher than this will raise an exception
minimum : Optional[datetime.timedelta] minimum : Optional[datetime.timedelta]
If provided, any parsed value lower than this will raise an exception If provided, any parsed value lower than this will raise an exception
Defaults to 0 seconds, pass None explicitly to allow negative values Defaults to 0 seconds, pass `datetime.timedelta.min` explicitly to allow negative values
allowed_units : Optional[List[str]] allowed_units : Optional[List[str]]
If provided, you can constrain a user to expressing the amount of time If provided, you can constrain a user to expressing the amount of time
in specific units. The units you can choose to provide are the same as the in specific units. The units you can choose to provide are the same as the