Merge.
This commit is contained in:
commit
b73389cf8c
|
@ -86,7 +86,7 @@ Limitations:
|
||||||
* time.monotonic() and time.perf_counter() may or may not be adjusted.
|
* time.monotonic() and time.perf_counter() may or may not be adjusted.
|
||||||
For example, ``CLOCK_MONOTONIC`` is slewed on Linux, whereas
|
For example, ``CLOCK_MONOTONIC`` is slewed on Linux, whereas
|
||||||
``GetTickCount()`` is not adjusted on Windows.
|
``GetTickCount()`` is not adjusted on Windows.
|
||||||
``time.get_clock_info('monotonic')['is_adjusted']`` can be used to check
|
``time.get_clock_info('monotonic')['adjusted']`` can be used to check
|
||||||
if the monotonic clock is adjusted or not.
|
if the monotonic clock is adjusted or not.
|
||||||
* No time.thread_time() function is proposed by this PEP because it is
|
* No time.thread_time() function is proposed by this PEP because it is
|
||||||
not needed by Python standard library nor a common asked feature.
|
not needed by Python standard library nor a common asked feature.
|
||||||
|
@ -119,8 +119,8 @@ Return a ``time.clock_info`` object which has the following attributes:
|
||||||
* ``implementation`` (str): name of the underlying operating system
|
* ``implementation`` (str): name of the underlying operating system
|
||||||
function. Examples: ``"QueryPerformanceCounter()"``,
|
function. Examples: ``"QueryPerformanceCounter()"``,
|
||||||
``"clock_gettime(CLOCK_REALTIME)"``.
|
``"clock_gettime(CLOCK_REALTIME)"``.
|
||||||
* ``is_monotonic`` (bool): True if the clock cannot go backward.
|
* ``monotonic`` (bool): True if the clock cannot go backward.
|
||||||
* ``is_adjusted`` (bool): True if the clock is adjusted (e.g. by a
|
* ``adjusted`` (bool): True if the clock can be adjusted (e.g. by a
|
||||||
NTP daemon).
|
NTP daemon).
|
||||||
* ``resolution`` (float): resolution in seconds of the clock.
|
* ``resolution`` (float): resolution in seconds of the clock.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue