From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 22 Jul 2004 00:54:37 +0000 (+0000)
Subject: SF patch 995225:  tarfile.py fix for bug #990325
X-Git-Tag: v2.4a2~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa1c7ff7e8dd9dbda8ed935b7db7c9a81a164621;p=thirdparty%2FPython%2Fcpython.git

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 40125b31246d..8fd0c50c92a5 100644
Binary files a/Lib/test/testtar.tar and b/Lib/test/testtar.tar differ
diff --git a/Misc/NEWS b/Misc/NEWS
index af7b384b59d5..6e8c710563a3 100644
--- 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
 -------