mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 15:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 84470-84471,84566-84567,84759 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84470 | florent.xicluna | 2010-09-03 22:00:37 +0200 (ven., 03 sept. 2010) | 1 line

  Strengthen BytesWarning tests.
........
  r84471 | florent.xicluna | 2010-09-03 22:23:40 +0200 (ven., 03 sept. 2010) | 1 line

  Typo
........
  r84566 | florent.xicluna | 2010-09-06 22:27:15 +0200 (lun., 06 sept. 2010) | 1 line

  typo
........
  r84567 | florent.xicluna | 2010-09-06 22:27:55 +0200 (lun., 06 sept. 2010) | 1 line

  typo
........
  r84759 | florent.xicluna | 2010-09-13 04:28:18 +0200 (lun., 13 sept. 2010) | 1 line

  Reenable test_ucs4 and remove some duplicated lines.
........
This commit is contained in:
Florent Xicluna 2010-09-13 07:46:37 +00:00
parent f994f04745
commit 9b90cd1f7b
6 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_unicode.py
View file

@ -593,9 +593,9 @@ class UnicodeTest(
)
# UTF-8 specific decoding tests
self.assertEqual(unicode('\xf0\xa3\x91\x96', 'utf-8'), u'\U00023456' )
self.assertEqual(unicode('\xf0\x90\x80\x82', 'utf-8'), u'\U00010002' )
self.assertEqual(unicode('\xe2\x82\xac', 'utf-8'), u'\u20ac' )
self.assertEqual(unicode('\xf0\xa3\x91\x96', 'utf-8'), u'\U00023456')
self.assertEqual(unicode('\xf0\x90\x80\x82', 'utf-8'), u'\U00010002')
self.assertEqual(unicode('\xe2\x82\xac', 'utf-8'), u'\u20ac')
# Other possible utf-8 test cases:
# * strict decoding testing for all of the
@ -1360,8 +1360,8 @@ class UnicodeTest(
def __unicode__(self):
return u'__unicode__ overridden'
u = U(u'xxx')
self.assertEquals("%s" % u, u'__unicode__ overridden')
self.assertEquals("{}".format(u), u'__unicode__ overridden')
self.assertEqual("%s" % u, u'__unicode__ overridden')
self.assertEqual("{}".format(u), u'__unicode__ overridden')
def test_main():