Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-105331: Fix asyncio.sleep() bug #105513

Closed
wants to merge 2 commits into from
Closed

gh-105331: Fix asyncio.sleep() bug #105513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc58f6
gh-105331: Fix asyncio.sleep() bug
weijay0804 Jun 8, 2023
8ea9e42
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion Lib/asyncio/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,9 +640,34 @@ def __sleep0():
yield


def _check_delay(delay):
"""Check if the value of 'delay' is valid."""

import sys
import math

SEC_TO_NS = 1000 * 1000 * 1000

if not isinstance(delay, (int, float)):
raise TypeError(f"{type(delay)} object cannot be interpreted as an integer")

# According to Modules/timemodule.c
if (delay > sys.maxsize / SEC_TO_NS):
Copy link
Member

@Eclips4 Eclips4 Jun 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is incorrect because of 32-bit platform (and that's why asyncio test failing on Windows 32-bit).
sys.maxsize on 32-bit platform equal to 2 ** 31 -1.
So, in that case sys.maxsize / SEC_TO_NS is equal to 2.147483647

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh!
I forgot about this matter.
In timemodule.c, INT64_MAX is used and is not subject to the limitation of 32-bit.
If I write it as INT64_MAX = 2**64 - 1, how would it be?

if (delay > INT64_MAX / SEC_TO_NS)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! I forgot about this matter. In timemodule.c, INT64_MAX is used and is not subject to the limitation of 32-bit. If I write it as INT64_MAX = 2**64 - 1, how would it be?

if (delay > INT64_MAX / SEC_TO_NS)

I think it's correct solution, but I'm not expert in this area. Let's wait for other opinions

raise OverflowError("timestamp too large to convert to C _PyTime_t")

if (delay < 0):
raise ValueError("sleep length must be non-negative")

if (math.isnan(delay)):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, seems there need to add check that delay is finite number. Use something like if not math.isfinite(delay): ... for resolve that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appears to be more accurate.

Thank you!

raise ValueError("Invalid value NaN (not a number)")


async def sleep(delay, result=None):
"""Coroutine that completes after a given time (in seconds)."""
if delay <= 0:

_check_delay(delay)

if delay == 0:
await __sleep0()
return result

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-06-08-16-29-43.gh-issue-105513.M7ueoq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix asyncio.sleep(float('nan')) does not raise ValueError bug