diff options
| -rw-r--r-- | Doc/library/os.rst | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index ff37d10..f76cd97 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -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. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 7c2cb12..fab44d6 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -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); |