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/socketserver.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/socketserver.py')
-rw-r--r-- | Lib/socketserver.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py index b585640..3d58590 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -136,10 +136,7 @@ try: import threading except ImportError: import dummy_threading as threading -try: - from time import monotonic as time -except ImportError: - from time import time as time +from time import monotonic as time __all__ = ["TCPServer","UDPServer","ForkingUDPServer","ForkingTCPServer", "ThreadingUDPServer","ThreadingTCPServer","BaseRequestHandler", |