summaryrefslogtreecommitdiffstats
path: root/Lib/queue.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2012-04-29 00:41:27 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2012-04-29 00:41:27 (GMT)
commitec89539ccccd6103665a7a5c7234cf09f27c1c72 (patch)
tree5899bfa59a08ae9db3e630c2419ee87b4df6b101 /Lib/queue.py
parentca6e40f12a3145856abfe69d5cd8b97df6ebca95 (diff)
downloadcpython-ec89539ccccd6103665a7a5c7234cf09f27c1c72.zip
cpython-ec89539ccccd6103665a7a5c7234cf09f27c1c72.tar.gz
cpython-ec89539ccccd6103665a7a5c7234cf09f27c1c72.tar.bz2
Issue #14428, #14397: Implement the PEP 418
* Rename time.steady() to time.monotonic() * On Windows, time.monotonic() uses GetTickCount/GetTickCount64() instead of QueryPerformanceCounter() * time.monotonic() uses CLOCK_HIGHRES if available * Add time.get_clock_info(), time.perf_counter() and time.process_time() functions
Diffstat (limited to 'Lib/queue.py')
-rw-r--r--Lib/queue.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/queue.py b/Lib/queue.py
index 1dc72c4..c3296fe 100644
--- a/Lib/queue.py
+++ b/Lib/queue.py
@@ -6,7 +6,10 @@ except ImportError:
import dummy_threading as threading
from collections import deque
from heapq import heappush, heappop
-from time import steady as time
+try:
+ from time import monotonic as time
+except ImportError:
+ from time import time
__all__ = ['Empty', 'Full', 'Queue', 'PriorityQueue', 'LifoQueue']