From 43fcf3a493d249eec6baf7b096563a89a749d434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gust=C3=A4bel?= Date: Fri, 12 Dec 2008 14:58:38 +0000 Subject: Merged revisions 67717 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r67717 | lars.gustaebel | 2008-12-12 14:58:03 +0100 (Fri, 12 Dec 2008) | 2 lines Issue #4616: TarFile.utime(): Restore directory times on Windows. ........ --- Lib/tarfile.py | 4 ---- Lib/test/test_tarfile.py | 9 +++------ Misc/NEWS | 2 ++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 222b433..be7daf1 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2265,10 +2265,6 @@ class TarFile(object): """ if not hasattr(os, 'utime'): return - if sys.platform == "win32" and tarinfo.isdir(): - # According to msdn.microsoft.com, it is an error (EACCES) - # to use utime() on directories. - return try: os.utime(targetpath, (tarinfo.mtime, tarinfo.mtime)) except EnvironmentError as e: diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 1f9e092..affbeeb 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -255,17 +255,14 @@ class MiscReadTest(ReadTest): def test_extractall(self): # Test if extractall() correctly restores directory permissions # and times (see issue1735). - if sys.platform == "win32": - # Win32 has no support for utime() on directories or - # fine grained permissions. - return - tar = tarfile.open(tarname, encoding="iso8859-1") directories = [t for t in tar if t.isdir()] tar.extractall(TEMPDIR, directories) for tarinfo in directories: path = os.path.join(TEMPDIR, tarinfo.name) - self.assertEqual(tarinfo.mode & 0o777, os.stat(path).st_mode & 0o777) + if sys.platform != "win32": + # Win32 has no support for fine grained permissions. + self.assertEqual(tarinfo.mode & 0o777, os.stat(path).st_mode & 0o777) self.assertEqual(tarinfo.mtime, os.path.getmtime(path)) tar.close() diff --git a/Misc/NEWS b/Misc/NEWS index 6568a1c..aaa65c5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,8 @@ Core and Builtins Library ------- +- Issue #4616: TarFile.utime(): Restore directory times on Windows. + - Issue #4021: tokenize.detect_encoding() now raises a SyntaxError when the codec cannot be found. This is for compatibility with the builtin behavior. -- cgit v0.12