[Python-checkins] r60758 - in python/trunk: Doc/library/os.rst Misc/NEWS Modules/posixmodule.c

Wed Feb 13 08:20:23 CET 2008

Author: georg.brandl
Date: Wed Feb 13 08:20:22 2008
New Revision: 60758
Modified:
 python/trunk/Doc/library/os.rst
 python/trunk/Misc/NEWS
 python/trunk/Modules/posixmodule.c
Log:
#2063: correct order of utime and stime in os.times()
result on Windows.
Modified: python/trunk/Doc/library/os.rst
==============================================================================

--- python/trunk/Doc/library/os.rst	(original)
+++ python/trunk/Doc/library/os.rst	Wed Feb 13 08:20:22 2008
@@ -1846,7 +1846,7 @@
 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()
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Feb 13 08:20:22 2008
@@ -1132,6 +1132,8 @@
 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.
Modified: python/trunk/Modules/posixmodule.c
==============================================================================
--- python/trunk/Modules/posixmodule.c	(original)
+++ python/trunk/Modules/posixmodule.c	Wed Feb 13 08:20:22 2008
@@ -5987,10 +5987,10 @@
 	*/
 	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);
