From 1f1613f0ccecaa8b87310caec39fc2b274205f73 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 6 Jan 2011 18:30:26 +0000 Subject: [PATCH] Merged revisions 87802 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87802 | antoine.pitrou | 2011-01-06 19:25:55 +0100 (jeu., 06 janv. 2011) | 6 lines Issue #7858: Raise an error properly when os.utime() fails under Windows on an existing file. (this does not seem to be easily testable) ........ --- Misc/NEWS | 3 +++ Modules/posixmodule.c | 1 + 2 files changed, 4 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index eea77ce0b4a..924f1f02f99 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,9 @@ Core and Builtins Library ------- +- Issue #7858: Raise an error properly when os.utime() fails under Windows + on an existing file. + - Issue #3839: wsgiref should not override a Content-Length header set by the application. Initial patch by Clovis Fabricio. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index bcc1219666c..8066d457d11 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2843,6 +2843,7 @@ posix_utime(PyObject *self, PyObject *args) something is wrong with the file, when it also could be the time stamp that gives a problem. */ win32_error("utime", NULL); + goto done; } Py_INCREF(Py_None); result = Py_None;