bpo-45429: Merge whatsnew about time.sleep (GH-29589)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>

diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 0f880910c6ee680e1f95afbb79c48fa3cc14aa73..622f66719cee719a316fc9bb9d6826391d591ecf 100644 (file)
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -362,7 +362,10 @@ Functions
    On Windows, if *secs* is zero, the thread relinquishes the remainder of its
    time slice to any other thread that is ready to run. If there are no other
    threads ready to run, the function returns immediately, and the thread
-   continues execution.
+   continues execution.  On Windows 8.1 and newer the implementation uses
+   a `high-resolution timer
+   <https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/high-resolution-timers>`_
+   which provides resolution of 100 nanoseconds. If *secs* is zero, ``Sleep(0)`` is used.
 
    Unix implementation:
 
@@ -370,9 +373,6 @@ Functions
    * Or use ``nanosleep()`` if available (resolution: 1 nanosecond);
    * Or use ``select()`` (resolution: 1 microsecond).
 
-   On Windows, a waitable timer is used (resolution: 100 nanosecond). If *secs* is
-   zero, ``Sleep(0)`` is used.
-
    .. versionchanged:: 3.11
       On Unix, the ``clock_nanosleep()`` and ``nanosleep()`` functions are now
       used if available. On Windows, a waitable timer is now used.

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 0c7c74e7c3242a46abca9db5adf3e4000de62c46..06a24151c32ccd18a00b2f592355eb0928c8ab99 100644 (file)
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -269,6 +269,7 @@ threading
   by system clock changes.
   (Contributed by Victor Stinner in :issue:`41710`.)
 
+
 time
 ----
 
@@ -278,14 +279,13 @@ time
   of 1 microsecond (10\ :sup:`-6` seconds).
   (Contributed by Benjamin Szőke and Victor Stinner in :issue:`21302`.)
 
-* On Windows, :func:`time.sleep` now uses a waitable timer which has a
-  resolution of 100 nanoseconds (10\ :sup:`-7` seconds). Previously, it had
-  a resolution of 1 millisecond (10\ :sup:`-3` seconds).
-  (Contributed by Benjamin Szőke and Victor Stinner in :issue:`21302`.)
+* On Windows 8.1 and newer, :func:`time.sleep` now uses a waitable timer based
+  on `high-resolution timers
+  <https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/high-resolution-timers>`_
+  which has a resolution of 100 nanoseconds (10\ :sup:`-7` seconds). Previously,
+  it had a resolution of 1 millisecond (10\ :sup:`-3` seconds).
+  (Contributed by Benjamin Szőke, Dong-hee Na, Eryk Sun and Victor Stinner in :issue:`21302` and :issue:`45429`.)
 
-* On Windows, :func:`time.sleep` now uses a waitable timer which supports high-resolution timers.
-  In Python 3.10, the best resolution was 1 ms, from Python 3.11 it's now smaller than 1 ms.
-  (Contributed by Dong-hee Na and Eryk Sun in :issue:`45429`.)
 
 unicodedata
 -----------