mirror of
https://github.com/python/cpython.git
synced 2025-07-30 06:34:15 +00:00
#2063: correct order of utime and stime in os.times()
result on Windows.
This commit is contained in:
parent
5f8bd3729e
commit
0a40ffb1b3
3 changed files with 5 additions and 3 deletions
|
@ -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
|
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
|
the past, in that order. See the Unix manual page :manpage:`times(2)` or the
|
||||||
corresponding Windows Platform API documentation. Availability: Macintosh, Unix,
|
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()
|
.. function:: wait()
|
||||||
|
|
|
@ -1132,6 +1132,8 @@ Library
|
||||||
Extension Modules
|
Extension Modules
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- #2063: correct order of utime and stime in os.times() result on Windows.
|
||||||
|
|
||||||
- Patch #1736: Fix file name handling of _msi.FCICreate.
|
- Patch #1736: Fix file name handling of _msi.FCICreate.
|
||||||
|
|
||||||
- Updated ``big5hkscs`` codec to the HKSCS revision of 2004.
|
- Updated ``big5hkscs`` codec to the HKSCS revision of 2004.
|
||||||
|
|
|
@ -5987,10 +5987,10 @@ posix_times(PyObject *self, PyObject *noargs)
|
||||||
*/
|
*/
|
||||||
return Py_BuildValue(
|
return Py_BuildValue(
|
||||||
"ddddd",
|
"ddddd",
|
||||||
(double)(kernel.dwHighDateTime*429.4967296 +
|
|
||||||
kernel.dwLowDateTime*1e-7),
|
|
||||||
(double)(user.dwHighDateTime*429.4967296 +
|
(double)(user.dwHighDateTime*429.4967296 +
|
||||||
user.dwLowDateTime*1e-7),
|
user.dwLowDateTime*1e-7),
|
||||||
|
(double)(kernel.dwHighDateTime*429.4967296 +
|
||||||
|
kernel.dwLowDateTime*1e-7),
|
||||||
(double)0,
|
(double)0,
|
||||||
(double)0,
|
(double)0,
|
||||||
(double)0);
|
(double)0);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue