summaryrefslogtreecommitdiffstats
path: root/Lib/trace.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-09-02 21:18:25 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-09-02 21:18:25 (GMT)
commitae58649721ec898ea4a101b0861e16fff3511cfa (patch)
treebb08b1a9b5f354212d7ca365d76659b09aed879a /Lib/trace.py
parent9bb758cee7f1694807ebe600b6230fb8e565d3ea (diff)
downloadcpython-ae58649721ec898ea4a101b0861e16fff3511cfa.zip
cpython-ae58649721ec898ea4a101b0861e16fff3511cfa.tar.gz
cpython-ae58649721ec898ea4a101b0861e16fff3511cfa.tar.bz2
Issue #22043: time.monotonic() is now always available
threading.Lock.acquire(), threading.RLock.acquire() and socket operations now use a monotonic clock, instead of the system clock, when a timeout is used.
Diffstat (limited to 'Lib/trace.py')
-rwxr-xr-xLib/trace.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/trace.py b/Lib/trace.py
index 1c888ac..fe84973 100755
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -59,10 +59,7 @@ import gc
import dis
import pickle
from warnings import warn as _warn
-try:
- from time import monotonic as _time
-except ImportError:
- from time import time as _time
+from time import monotonic as _time
try:
import threading