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

[M.-A. Lemburg]

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

Modified Files:
	test_unicode.py 
Log Message:
Patch by Finn Bock to make test_unicode.py work for Jython.



Index: test_unicode.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** test_unicode.py	2001/01/29 11:14:15	1.30
--- test_unicode.py	2001/02/10 14:09:31	1.31
***************
*** 262,266 ****
  test('isupper', u'A', 1)
  test('isupper', u'\n', 0)
! test('isupper', u'\u1FFc', 0)
  test('isupper', u'ABC', 1)
  test('isupper', u'AbC', 0)
--- 262,267 ----
  test('isupper', u'A', 1)
  test('isupper', u'\n', 0)
! if sys.platform[:4] != 'java':
!     test('isupper', u'\u1FFc', 0)
  test('isupper', u'ABC', 1)
  test('isupper', u'AbC', 0)
***************
*** 340,350 ****
  verify(u"%c" % (34,) == u'"')
  verify(u"%c" % (36,) == u'$')
! value = u"%r, %r" % (u"abc", "abc")
! if value != u"u'abc', 'abc'":
!     print '*** formatting failed for "%s"' % 'u"%r, %r" % (u"abc", "abc")'
  
  verify(u"%(x)s, %(y)s" % {'x':u"abc", 'y':"def"} == u'abc, def')
  try:
!     value = u"%(x)s, %(ä)s" % {'x':u"abc", u'ä'.encode('utf-8'):"def"}
  except KeyError:
      print '*** formatting failed for "%s"' % "u'abc, def'"
--- 341,355 ----
  verify(u"%c" % (34,) == u'"')
  verify(u"%c" % (36,) == u'$')
! if sys.platform[:4] != 'java':
!     value = u"%r, %r" % (u"abc", "abc")
!     if value != u"u'abc', 'abc'":
!         print '*** formatting failed for "%s"' % 'u"%r, %r" % (u"abc", "abc")'
  
  verify(u"%(x)s, %(y)s" % {'x':u"abc", 'y':"def"} == u'abc, def')
  try:
!     if sys.platform[:4] != 'java':
!         value = u"%(x)s, %(ä)s" % {'x':u"abc", u'ä'.encode('utf-8'):"def"}
!     else:
!         value = u"%(x)s, %(ä)s" % {'x':u"abc", u'ä':"def"}
  except KeyError:
      print '*** formatting failed for "%s"' % "u'abc, def'"