diff options
| -rw-r--r-- | Lib/tarfile.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_tarfile.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index ab74cc5925..b678185c2e 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2284,10 +2284,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, e: diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 7e4fd25cf0..f5c9ed434e 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -256,17 +256,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 & 0777, os.stat(path).st_mode & 0777) + if sys.platform != "win32": + # Win32 has no support for fine grained permissions. + self.assertEqual(tarinfo.mode & 0777, os.stat(path).st_mode & 0777) self.assertEqual(tarinfo.mtime, os.path.getmtime(path)) tar.close() @@ -32,6 +32,8 @@ Core and Builtins Library ------- +- Issue #4616: TarFile.utime(): Restore directory times on Windows. + - Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat libs. |