Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Bug #1565150: Fix subsecond processing for os.utime on Windows.

This commit is contained in:
Martin v. Löwis 2006-10-09 20:44:25 +00:00
parent e5ec613c4b
commit f43893a878
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_os.py
View File

@ -223,6 +223,14 @@ class StatAttributeTests(unittest.TestCase):
except TypeError:
pass
# Restrict test to Win32, since there is no guarantee other
# systems support centiseconds
if sys.platform == 'win32':
def test_1565150(self):
t1 = 1159195039.25
os.utime(self.fname, (t1, t1))
self.assertEquals(os.stat(self.fname).st_mtime, t1)
from test import mapping_tests
class EnvironTests(mapping_tests.BasicTestMappingProtocol):

2
Misc/NEWS
View File

@ -75,6 +75,8 @@ Core and builtins
Library
-------
- Bug #1565150: Fix subsecond processing for os.utime on Windows.
- Support for MSVC 8 was added to bdist_wininst.
- Bug #1446043: correctly raise a LookupError if an encoding name given

6
Modules/posixmodule.c
View File

@ -792,7 +792,7 @@ time_t_to_FILE_TIME(int time_in, int nsec_in, FILETIME *out_ptr)
/* XXX endianness */
__int64 out;
out = time_in + secs_between_epochs;
out = out * 10000000 + nsec_in;
out = out * 10000000 + nsec_in / 100;
memcpy(out_ptr, &out, sizeof(out));
}
@ -2501,11 +2501,11 @@ posix_utime(PyObject *self, PyObject *args)
if (extract_time(PyTuple_GET_ITEM(arg, 0),
&atimesec, &ausec) == -1)
goto done;
time_t_to_FILE_TIME(atimesec, ausec, &atime);
time_t_to_FILE_TIME(atimesec, 1000*ausec, &atime);
if (extract_time(PyTuple_GET_ITEM(arg, 1),
&mtimesec, &musec) == -1)
goto done;
time_t_to_FILE_TIME(mtimesec, musec, &mtime);
time_t_to_FILE_TIME(mtimesec, 1000*musec, &mtime);
}
if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
/* Avoid putting the file name into the error here,