Commit 0a40ffb1 authored by Georg Brandl's avatar Georg Brandl

#2063: correct order of utime and stime in os.times()

result on Windows.
parent 5f8bd372
......@@ -1846,7 +1846,7 @@ written in Python, such as a mail server's external command delivery program.
user time, children's system time, and elapsed real time since a fixed point in
the past, in that order. See the Unix manual page :manpage:`times(2)` or the
corresponding Windows Platform API documentation. Availability: Macintosh, Unix,
Windows.
Windows. On Windows, only the first two items are filled, the others are zero.
.. function:: wait()
......
......@@ -1132,6 +1132,8 @@ Library
Extension Modules
-----------------
- #2063: correct order of utime and stime in os.times() result on Windows.
- Patch #1736: Fix file name handling of _msi.FCICreate.
- Updated ``big5hkscs`` codec to the HKSCS revision of 2004.
......
......@@ -5987,10 +5987,10 @@ posix_times(PyObject *self, PyObject *noargs)
*/
return Py_BuildValue(
"ddddd",
(double)(kernel.dwHighDateTime*429.4967296 +
kernel.dwLowDateTime*1e-7),
(double)(user.dwHighDateTime*429.4967296 +
user.dwLowDateTime*1e-7),
(double)(kernel.dwHighDateTime*429.4967296 +
kernel.dwLowDateTime*1e-7),
(double)0,
(double)0,
(double)0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment