[Python-checkins] python/dist/src/Lib/test test_bool.py,1.10,1.11

[doerwalter@users.sourceforge.net]

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

Modified Files:
	test_bool.py 
Log Message:
Consistently use test_support.foo everywhere.

Remove the last use of veris().

Remove now useless imports and functions.


Index: test_bool.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bool.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_bool.py	27 Apr 2003 07:54:23 -0000	1.10
--- test_bool.py	1 May 2003 13:12:34 -0000	1.11
***************
*** 6,19 ****
  import os
  
- from test.test_support import verbose, TestFailed, TESTFN, vereq, have_unicode
- 
- def veris(a, b):
-     if a is not b:
-         raise TestFailed, "%r is %r" % (a, b)
- 
- def verisnot(a, b):
-     if a is b:
-         raise TestFailed, "%r is %r" % (a, b)
- 
  class BoolTest(unittest.TestCase):
  
--- 6,9 ----
***************
*** 218,222 ****
          self.assertIs("xyz".startswith("z"), False)
  
!         if have_unicode:
              self.assertIs(unicode("xyz", 'ascii').endswith(unicode("z", 'ascii')), True)
              self.assertIs(unicode("xyz", 'ascii').endswith(unicode("x", 'ascii')), False)
--- 208,212 ----
          self.assertIs("xyz".startswith("z"), False)
  
!         if test_support.have_unicode:
              self.assertIs(unicode("xyz", 'ascii').endswith(unicode("z", 'ascii')), True)
              self.assertIs(unicode("xyz", 'ascii').endswith(unicode("x", 'ascii')), False)
***************
*** 257,266 ****
      def test_fileclosed(self):
          try:
!             f = file(TESTFN, "w")
              self.assertIs(f.closed, False)
              f.close()
              self.assertIs(f.closed, True)
          finally:
!             os.remove(TESTFN)
  
      def test_operator(self):
--- 247,256 ----
      def test_fileclosed(self):
          try:
!             f = file(test_support.TESTFN, "w")
              self.assertIs(f.closed, False)
              f.close()
              self.assertIs(f.closed, True)
          finally:
!             os.remove(test_support.TESTFN)
  
      def test_operator(self):
***************
*** 289,294 ****
      def test_marshal(self):
          import marshal
!         veris(marshal.loads(marshal.dumps(True)), True)
!         veris(marshal.loads(marshal.dumps(False)), False)
  
      def test_pickle(self):
--- 279,284 ----
      def test_marshal(self):
          import marshal
!         self.assertIs(marshal.loads(marshal.dumps(True)), True)
!         self.assertIs(marshal.loads(marshal.dumps(False)), False)
  
      def test_pickle(self):