[Python-checkins] CVS: python/dist/src/Lib/test test_unicode.py,1.19,1.20

[M.-A. Lemburg]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25220/Lib/test

Modified Files:
	test_unicode.py 
Log Message:
Removing UTF-16 aware Unicode comparison code. This kind of compare
function (together with other locale aware ones) should into a new collation
support module. See python-dev for a discussion of this removal.

Note: This patch should also be applied to the 1.6 branch.

Index: test_unicode.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** test_unicode.py	2000/07/07 17:48:52	1.19
--- test_unicode.py	2000/08/08 08:03:46	1.20
***************
*** 169,222 ****
  print 'done.'
  
! print 'Testing UTF-16 code point order comparisons...',
! #No surrogates, no fixup required.
! assert u'\u0061' < u'\u20ac'
! # Non surrogate below surrogate value, no fixup required
! assert u'\u0061' < u'\ud800\udc02'
  
! # Non surrogate above surrogate value, fixup required
! def test_lecmp(s, s2):
!   assert s <  s2 , "comparison failed on %s < %s" % (s, s2)
!   
! def test_fixup(s):
!   s2 = u'\ud800\udc01'
!   test_lecmp(s, s2)
!   s2 = u'\ud900\udc01'
!   test_lecmp(s, s2)
!   s2 = u'\uda00\udc01'
!   test_lecmp(s, s2)
!   s2 = u'\udb00\udc01'
!   test_lecmp(s, s2)
!   s2 = u'\ud800\udd01'
!   test_lecmp(s, s2)
!   s2 = u'\ud900\udd01'
!   test_lecmp(s, s2)
!   s2 = u'\uda00\udd01'
!   test_lecmp(s, s2)
!   s2 = u'\udb00\udd01'
!   test_lecmp(s, s2)
!   s2 = u'\ud800\ude01'
!   test_lecmp(s, s2)
!   s2 = u'\ud900\ude01'
!   test_lecmp(s, s2)
!   s2 = u'\uda00\ude01'
!   test_lecmp(s, s2)
!   s2 = u'\udb00\ude01'
!   test_lecmp(s, s2)
!   s2 = u'\ud800\udfff'
!   test_lecmp(s, s2)
!   s2 = u'\ud900\udfff'
!   test_lecmp(s, s2)
!   s2 = u'\uda00\udfff'
!   test_lecmp(s, s2)
!   s2 = u'\udb00\udfff'
!   test_lecmp(s, s2)
  
! test_fixup(u'\ue000')
! test_fixup(u'\uff61')
  
! # Surrogates on both sides, no fixup required
! assert u'\ud800\udc02' < u'\ud84d\udc56'
! print 'done.'
  
  test('ljust', u'abc',  u'abc       ', 10)
--- 169,225 ----
  print 'done.'
  
! if 0:
!     # Move these tests to a Unicode collation module test...
  
!     print 'Testing UTF-16 code point order comparisons...',
!     #No surrogates, no fixup required.
!     assert u'\u0061' < u'\u20ac'
!     # Non surrogate below surrogate value, no fixup required
!     assert u'\u0061' < u'\ud800\udc02'
  
!     # Non surrogate above surrogate value, fixup required
!     def test_lecmp(s, s2):
!       assert s <  s2 , "comparison failed on %s < %s" % (s, s2)
  
!     def test_fixup(s):
!       s2 = u'\ud800\udc01'
!       test_lecmp(s, s2)
!       s2 = u'\ud900\udc01'
!       test_lecmp(s, s2)
!       s2 = u'\uda00\udc01'
!       test_lecmp(s, s2)
!       s2 = u'\udb00\udc01'
!       test_lecmp(s, s2)
!       s2 = u'\ud800\udd01'
!       test_lecmp(s, s2)
!       s2 = u'\ud900\udd01'
!       test_lecmp(s, s2)
!       s2 = u'\uda00\udd01'
!       test_lecmp(s, s2)
!       s2 = u'\udb00\udd01'
!       test_lecmp(s, s2)
!       s2 = u'\ud800\ude01'
!       test_lecmp(s, s2)
!       s2 = u'\ud900\ude01'
!       test_lecmp(s, s2)
!       s2 = u'\uda00\ude01'
!       test_lecmp(s, s2)
!       s2 = u'\udb00\ude01'
!       test_lecmp(s, s2)
!       s2 = u'\ud800\udfff'
!       test_lecmp(s, s2)
!       s2 = u'\ud900\udfff'
!       test_lecmp(s, s2)
!       s2 = u'\uda00\udfff'
!       test_lecmp(s, s2)
!       s2 = u'\udb00\udfff'
!       test_lecmp(s, s2)
! 
!     test_fixup(u'\ue000')
!     test_fixup(u'\uff61')
! 
!     # Surrogates on both sides, no fixup required
!     assert u'\ud800\udc02' < u'\ud84d\udc56'
!     print 'done.'
  
  test('ljust', u'abc',  u'abc       ', 10)