SF patch 995225: tarfile.py fix for bug #990325

Removes CVS keywords from this binary file, so that test_tarfile passes
regardless of whether Python is checked out with -kk.

diff --git a/Lib/test/testtar.tar b/Lib/test/testtar.tar
index 40125b31246d371d4e4b85c9f768e23114e72d2e..8fd0c50c92a54790f66e231202f97a196e17f2f0 100644 (file)
Binary files a/Lib/test/testtar.tar and b/Lib/test/testtar.tar differ

diff --git a/Misc/NEWS b/Misc/NEWS
index af7b384b59d5b381b5e266d7235ae5e96da6d6dc..6e8c710563a31b88fbdbe0c47054643c0f127b16 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,7 +47,7 @@ Library
   from a tarfile.
 
 - Patch #846659.  Fix an error in tarfile.py when using
-  GNU longname/longlink creation. 
+  GNU longname/longlink creation.
 
 - The obsolete FCNTL.py has been deleted.  The builtin fcntl module
   has been available (on platforms that support fcntl) since Python
@@ -144,9 +144,13 @@ New platforms
 Tests
 -----
 
-- The test data files for the decimal test suite are now installed on 
+- The test data files for the decimal test suite are now installed on
   platforms that use the Makefile.
 
+- SF patch 995225:  The test file testtar.tar accidentally contained
+  CVS keywords (like $Id$), which could cause spurious failures in
+  test_tarfile.py depending on how the test file was checked out.
+
 Windows
 -------