diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-09-13 07:46:37 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-09-13 07:46:37 (GMT) |
| commit | 9b90cd1f7b7fa658a48389ca599cd6ffde922e34 (patch) | |
| tree | 860050591ce74169f13d8fb1ebaf3cb735de6b7e /Lib/test/test_unicode.py | |
| parent | f994f047455f9a558f9da4a9a9df9a679fcdd628 (diff) | |
| download | cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.zip cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.tar.gz cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.tar.bz2 | |
Merged revisions 84470-84471,84566-84567,84759 via svnmerge from
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.
........
Diffstat (limited to 'Lib/test/test_unicode.py')
| -rw-r--r-- | Lib/test/test_unicode.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 1151e86..b309704 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -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(): |