Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r95246:1d9db7971be3
Date: 2018-10-26 11:10 +0200
http://bitbucket.org/pypy/pypy/changeset/1d9db7971be3/
Log: Forward-port from default
diff --git a/pypy/module/thread/os_lock.py b/pypy/module/thread/os_lock.py
--- a/pypy/module/thread/os_lock.py
+++ b/pypy/module/thread/os_lock.py
@@ -49,7 +49,8 @@
# Run signal handlers if we were interrupted
space.getexecutioncontext().checksignals()
if microseconds >= 0:
- microseconds = r_longlong(endtime - (time.time() * 1e6))
+ microseconds = r_longlong((endtime - (time.time() * 1e6))
+ + 0.999)
# Check for negative values, since those mean block
# forever
if microseconds <= 0:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
