[Python-checkins] python/dist/src/Lib/test test_tarfile.py,1.4,1.5

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv12208

Modified Files:
	test_tarfile.py 
Log Message:
Two fixes to make this test pass on MacOS9:
- the test was sloppy about filenames: "0-REGTYPE-TEXT" was used where
  the archive held "/0-REGTYPE-TEXT".
- tarfile extracts all files in binary mode, but the test expected to be able to
  read and compare text files in text mode. Use universal text mode.

Index: test_tarfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tarfile.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_tarfile.py	19 Feb 2003 02:41:43 -0000	1.4
--- test_tarfile.py	7 Mar 2003 12:50:45 -0000	1.5
***************
*** 75,79 ****
          if self.sep != "|":
              f1 = self.tar.extractfile("S-SPARSE")
!             f2 = self.tar.extractfile("S-SPARSE-WITH-NULLS")
              self.assert_(f1.read() == f2.read(),
                           "_FileObject failed on sparse file member")
--- 75,79 ----
          if self.sep != "|":
              f1 = self.tar.extractfile("S-SPARSE")
!             f2 = self.tar.extractfile("/S-SPARSE-WITH-NULLS")
              self.assert_(f1.read() == f2.read(),
                           "_FileObject failed on sparse file member")
***************
*** 83,89 ****
          """
          if self.sep != "|":
!             filename = "0-REGTYPE-TEXT"
              self.tar.extract(filename, dirname())
!             lines1 = file(os.path.join(dirname(), filename), "r").readlines()
              lines2 = self.tar.extractfile(filename).readlines()
              self.assert_(lines1 == lines2,
--- 83,89 ----
          """
          if self.sep != "|":
!             filename = "/0-REGTYPE-TEXT"
              self.tar.extract(filename, dirname())
!             lines1 = file(os.path.join(dirname(), filename), "rU").readlines()
              lines2 = self.tar.extractfile(filename).readlines()
              self.assert_(lines1 == lines2,
***************
*** 94,98 ****
          """
          if self.sep != "|":
!             filename = "0-REGTYPE"
              self.tar.extract(filename, dirname())
              data = file(os.path.join(dirname(), filename), "rb").read()
--- 94,98 ----
          """
          if self.sep != "|":
!             filename = "/0-REGTYPE"
              self.tar.extract(filename, dirname())
              data = file(os.path.join(dirname(), filename), "rb").read()