[Python-checkins] r67717 - in python/trunk: Lib/tarfile.py Lib/test/test_tarfile.py Misc/NEWS

Fri Dec 12 14:58:03 CET 2008

Author: lars.gustaebel
Date: Fri Dec 12 14:58:03 2008
New Revision: 67717
Log:
Issue #4616: TarFile.utime(): Restore directory times on Windows.
Modified:
 python/trunk/Lib/tarfile.py
 python/trunk/Lib/test/test_tarfile.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/tarfile.py
==============================================================================

--- python/trunk/Lib/tarfile.py	(original)
+++ python/trunk/Lib/tarfile.py	Fri Dec 12 14:58:03 2008
@@ -2284,10 +2284,6 @@
 """
 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:
Modified: python/trunk/Lib/test/test_tarfile.py
==============================================================================
--- python/trunk/Lib/test/test_tarfile.py	(original)
+++ python/trunk/Lib/test/test_tarfile.py	Fri Dec 12 14:58:03 2008
@@ -256,17 +256,14 @@
 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()
 
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Fri Dec 12 14:58:03 2008
@@ -74,6 +74,8 @@
 Library
 -------
 
+- Issue #4616: TarFile.utime(): Restore directory times on Windows.
+
 - Issue #4084: Fix max, min, max_mag and min_mag Decimal methods to
 give correct results in the case where one argument is a quiet NaN
 and the other is a finite number that requires rounding.
