[Python-checkins] python/dist/src/Lib/test string_tests.py, 1.36, 1.37

[perky at users.sourceforge.net]

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

Modified Files:
	string_tests.py 
Log Message:
[SF #866875] Add a specialized routine for one character
separaters on str.split() and str.rsplit().


Index: string_tests.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** string_tests.py	23 Dec 2003 09:10:16 -0000	1.36
--- string_tests.py	5 Jan 2004 00:29:51 -0000	1.37
***************
*** 176,181 ****
          self.checkequal(['this', 'is', 'the', 'split', 'function'],
              'this is the split function', 'split')
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'split', '|')
!         self.checkequal(['a', 'b', 'c|d'], 'a|b|c|d', 'split', '|', 2)
          self.checkequal(['a', 'b c d'], 'a b c d', 'split', None, 1)
          self.checkequal(['a', 'b', 'c d'], 'a b c d', 'split', None, 2)
--- 176,182 ----
          self.checkequal(['this', 'is', 'the', 'split', 'function'],
              'this is the split function', 'split')
! 
!         # by whitespace
!         self.checkequal(['a', 'b', 'c', 'd'], 'a b c d ', 'split')
          self.checkequal(['a', 'b c d'], 'a b c d', 'split', None, 1)
          self.checkequal(['a', 'b', 'c d'], 'a b c d', 'split', None, 2)
***************
*** 184,191 ****
          self.checkequal(['a b c d'], 'a b c d', 'split', None, 0)
          self.checkequal(['a', 'b', 'c  d'], 'a  b  c  d', 'split', None, 2)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a b c d ', 'split')
          self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'split', '//')
          self.checkequal(['endcase ', ''], 'endcase test', 'split', 'test')
  
          self.checkraises(TypeError, 'hello', 'split', 42, 42, 42)
  
--- 185,214 ----
          self.checkequal(['a b c d'], 'a b c d', 'split', None, 0)
          self.checkequal(['a', 'b', 'c  d'], 'a  b  c  d', 'split', None, 2)
! 
!         # by a char
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'split', '|')
!         self.checkequal(['a', 'b|c|d'], 'a|b|c|d', 'split', '|', 1)
!         self.checkequal(['a', 'b', 'c|d'], 'a|b|c|d', 'split', '|', 2)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'split', '|', 3)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'split', '|', 4)
!         self.checkequal(['a|b|c|d'], 'a|b|c|d', 'split', '|', 0)
!         self.checkequal(['a', '', 'b||c||d'], 'a||b||c||d', 'split', '|', 2)
!         self.checkequal(['endcase ', ''], 'endcase |', 'split', '|')
!         self.checkequal(['a', '', 'b\x00c\x00d'], 'a\x00\x00b\x00c\x00d', 'split', '\x00', 2)
! 
!         # by string
          self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'split', '//')
+         self.checkequal(['a', 'b//c//d'], 'a//b//c//d', 'split', '//', 1)
+         self.checkequal(['a', 'b', 'c//d'], 'a//b//c//d', 'split', '//', 2)
+         self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'split', '//', 3)
+         self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'split', '//', 4)
+         self.checkequal(['a//b//c//d'], 'a//b//c//d', 'split', '//', 0)
+         self.checkequal(['a', '', 'b////c////d'], 'a////b////c////d', 'split', '//', 2)
          self.checkequal(['endcase ', ''], 'endcase test', 'split', 'test')
  
+         # mixed use of str and unicode
+         self.checkequal([u'a', u'b', u'c d'], 'a b c d', 'split', u' ', 2)
+ 
+         # argument type
          self.checkraises(TypeError, 'hello', 'split', 42, 42, 42)
  
***************
*** 193,198 ****
          self.checkequal(['this', 'is', 'the', 'rsplit', 'function'],
                           'this is the rsplit function', 'rsplit')
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|')
!         self.checkequal(['a|b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|', 2)
          self.checkequal(['a b c', 'd'], 'a b c d', 'rsplit', None, 1)
          self.checkequal(['a b', 'c', 'd'], 'a b c d', 'rsplit', None, 2)
--- 216,222 ----
          self.checkequal(['this', 'is', 'the', 'rsplit', 'function'],
                           'this is the rsplit function', 'rsplit')
! 
!         # by whitespace
!         self.checkequal(['a', 'b', 'c', 'd'], 'a b c d ', 'rsplit')
          self.checkequal(['a b c', 'd'], 'a b c d', 'rsplit', None, 1)
          self.checkequal(['a b', 'c', 'd'], 'a b c d', 'rsplit', None, 2)
***************
*** 200,214 ****
          self.checkequal(['a', 'b', 'c', 'd'], 'a b c d', 'rsplit', None, 4)
          self.checkequal(['a b c d'], 'a b c d', 'rsplit', None, 0)
-         self.checkequal(['a, b, c', 'd'], 'a, b, c, d', 'rsplit', ', ', 1)
-         self.checkequal(['a, b', 'c', 'd'], 'a, b, c, d', 'rsplit', ', ', 2)
-         self.checkequal(['a', 'b', 'c', 'd'], 'a, b, c, d', 'rsplit', ', ', 3)
-         self.checkequal(['a', 'b', 'c', 'd'], 'a, b, c, d', 'rsplit', ', ', 4)
-         self.checkequal(['a, b, c, d'], 'a, b, c, d', 'rsplit', ', ', 0)
          self.checkequal(['a  b', 'c', 'd'], 'a  b  c  d', 'rsplit', None, 2)
!         self.checkequal(['a\x00b', 'c'], 'a\x00b\x00c', 'rsplit', '\x00', 1)
!         self.checkequal(['', ''], 'abcd', 'rsplit', 'abcd')
          self.checkequal([u'a b', u'c', u'd'], 'a b c d', 'rsplit', u' ', 2)
!         self.checkequal(['', ' endcase'], '| endcase', 'rsplit', '|')
!         self.checkequal(['', ' endcase'], 'test endcase', 'rsplit', 'test')
  
      def test_strip(self):
--- 224,255 ----
          self.checkequal(['a', 'b', 'c', 'd'], 'a b c d', 'rsplit', None, 4)
          self.checkequal(['a b c d'], 'a b c d', 'rsplit', None, 0)
          self.checkequal(['a  b', 'c', 'd'], 'a  b  c  d', 'rsplit', None, 2)
! 
!         # by a char
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|')
!         self.checkequal(['a|b|c', 'd'], 'a|b|c|d', 'rsplit', '|', 1)
!         self.checkequal(['a|b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|', 2)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|', 3)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|', 4)
!         self.checkequal(['a|b|c|d'], 'a|b|c|d', 'rsplit', '|', 0)
!         self.checkequal(['a||b||c', '', 'd'], 'a||b||c||d', 'rsplit', '|', 2)
!         self.checkequal(['', ' begincase'], '| begincase', 'rsplit', '|')
!         self.checkequal(['a\x00\x00b', 'c', 'd'], 'a\x00\x00b\x00c\x00d', 'rsplit', '\x00', 2)
! 
!         # by string
!         self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'rsplit', '//')
!         self.checkequal(['a//b//c', 'd'], 'a//b//c//d', 'rsplit', '//', 1)
!         self.checkequal(['a//b', 'c', 'd'], 'a//b//c//d', 'rsplit', '//', 2)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'rsplit', '//', 3)
!         self.checkequal(['a', 'b', 'c', 'd'], 'a//b//c//d', 'rsplit', '//', 4)
!         self.checkequal(['a//b//c//d'], 'a//b//c//d', 'rsplit', '//', 0)
!         self.checkequal(['a////b////c', '', 'd'], 'a////b////c////d', 'rsplit', '//', 2)
!         self.checkequal(['', ' begincase'], 'test begincase', 'rsplit', 'test')
! 
!         # mixed use of str and unicode
          self.checkequal([u'a b', u'c', u'd'], 'a b c d', 'rsplit', u' ', 2)
! 
!         # argument type
!         self.checkraises(TypeError, 'hello', 'rsplit', 42, 42, 42)
  
      def test_strip(self):