diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-09-02 21:18:25 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-09-02 21:18:25 (GMT) |
| commit | ae58649721ec898ea4a101b0861e16fff3511cfa (patch) | |
| tree | bb08b1a9b5f354212d7ca365d76659b09aed879a /Lib/threading.py | |
| parent | 9bb758cee7f1694807ebe600b6230fb8e565d3ea (diff) | |
| download | cpython-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/threading.py')
| -rw-r--r-- | Lib/threading.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 66620a9..2ce037e 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -3,10 +3,7 @@ import sys as _sys import _thread -try: - from time import monotonic as _time -except ImportError: - from time import time as _time +from time import monotonic as _time from traceback import format_exc as _format_exc from _weakrefset import WeakSet from itertools import islice as _islice |