diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-04-03 11:10:54 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-04-03 11:10:54 (GMT) |
| commit | 13019fdef3b6d589f8d7602943c76fcc637114ea (patch) | |
| tree | 975aa7bea2e9e07236ef08b4e485e46079ff5b9f /Modules/_threadmodule.c | |
| parent | 21dfffa218be821af03bc3cdf928a62e9431aaf8 (diff) | |
| download | cpython-13019fdef3b6d589f8d7602943c76fcc637114ea.zip cpython-13019fdef3b6d589f8d7602943c76fcc637114ea.tar.gz cpython-13019fdef3b6d589f8d7602943c76fcc637114ea.tar.bz2 | |
Issue #22117: Add a new _PyTime_FromSeconds() function
Fix also _Py_InitializeEx_Private(): initialize time before initializing
import, import_init() uses the _PyTime API (for thread locks).
Diffstat (limited to 'Modules/_threadmodule.c')
| -rw-r--r-- | Modules/_threadmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index 323447f..812c8a3 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -101,7 +101,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds, char *kwlist[] = {"blocking", "timeout", NULL}; int blocking = 1; PyObject *timeout_obj = NULL; - const _PyTime_t unset_timeout = _PyTime_FromNanoseconds(-1000000000); + const _PyTime_t unset_timeout = _PyTime_FromSeconds(-1); *timeout = unset_timeout ; |