traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reenable test_ucs4 and remove some duplicated lines.

This commit is contained in:
Florent Xicluna 2010-09-13 02:28:18 +00:00
parent 0f4dd9a8e5
commit a87b383ac1
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/string_tests.py
View File

@ -1131,7 +1131,7 @@ class MixinStrUnicodeUserStringTest:
format = '%%.%if' % prec format = '%%.%if' % prec
value = 0.01 value = 0.01
for x in range(60): for x in range(60):
value = value * 3.141592655 / 3.0 * 10.0 value = value * 3.14159265359 / 3.0 * 10.0
self.checkcall(format, "__mod__", value) self.checkcall(format, "__mod__", value)
def test_inplace_rewrites(self): def test_inplace_rewrites(self):

41
Lib/test/test_unicode.py
View File

@ -62,7 +62,7 @@ class UnicodeTest(string_tests.CommonTest,
self.assertRaises(SyntaxError, eval, '\'\\Uffffffff\'') self.assertRaises(SyntaxError, eval, '\'\\Uffffffff\'')
self.assertRaises(SyntaxError, eval, '\'\\U%08x\'' % 0x110000) self.assertRaises(SyntaxError, eval, '\'\\U%08x\'' % 0x110000)
# raw strings should not have unicode escapes # raw strings should not have unicode escapes
self.assertNotEquals(r"\u0020", " ") self.assertNotEqual(r"\u0020", " ")
def test_ascii(self): def test_ascii(self):
if not sys.platform.startswith('java'): if not sys.platform.startswith('java'):
@ -286,13 +286,7 @@ class UnicodeTest(string_tests.CommonTest,
def test_comparison(self): def test_comparison(self):
# Comparisons: # Comparisons:
self.assertEqual('abc', 'abc') self.assertEqual('abc', 'abc')
self.assertEqual('abc', 'abc')
self.assertEqual('abc', 'abc')
self.assertTrue('abcd' > 'abc') self.assertTrue('abcd' > 'abc')
self.assertTrue('abcd' > 'abc')
self.assertTrue('abcd' > 'abc')
self.assertTrue('abc' < 'abcd')
self.assertTrue('abc' < 'abcd')
self.assertTrue('abc' < 'abcd') self.assertTrue('abc' < 'abcd')
if 0: if 0:
@ -652,8 +646,6 @@ class UnicodeTest(string_tests.CommonTest,
self.assertRaises(IndexError, '{1}'.format, 'abc') self.assertRaises(IndexError, '{1}'.format, 'abc')
self.assertRaises(KeyError, '{x}'.format) self.assertRaises(KeyError, '{x}'.format)
self.assertRaises(ValueError, "}{".format) self.assertRaises(ValueError, "}{".format)
self.assertRaises(ValueError, "{".format)
self.assertRaises(ValueError, "}".format)
self.assertRaises(ValueError, "abc{0:{}".format) self.assertRaises(ValueError, "abc{0:{}".format)
self.assertRaises(ValueError, "{0".format) self.assertRaises(ValueError, "{0".format)
self.assertRaises(IndexError, "{0.}".format) self.assertRaises(IndexError, "{0.}".format)
@ -1265,21 +1257,20 @@ class UnicodeTest(string_tests.CommonTest,
y = x.encode("raw-unicode-escape").decode("raw-unicode-escape") y = x.encode("raw-unicode-escape").decode("raw-unicode-escape")
self.assertEqual(x, y) self.assertEqual(x, y)
# FIXME y = br'\U00100000'
#y = r'\U00100000' x = y.decode("raw-unicode-escape").encode("raw-unicode-escape")
#x = y.encode("raw-unicode-escape").decode("raw-unicode-escape") self.assertEqual(x, y)
#self.assertEqual(x, y) y = br'\U00010000'
#y = r'\U00010000' x = y.decode("raw-unicode-escape").encode("raw-unicode-escape")
#x = y.encode("raw-unicode-escape").decode("raw-unicode-escape") self.assertEqual(x, y)
#self.assertEqual(x, y)
#try: try:
# '\U11111111'.decode("raw-unicode-escape") br'\U11111111'.decode("raw-unicode-escape")
#except UnicodeDecodeError as e: except UnicodeDecodeError as e:
# self.assertEqual(e.start, 0) self.assertEqual(e.start, 0)
# self.assertEqual(e.end, 10) self.assertEqual(e.end, 10)
#else: else:
# self.fail("Should have raised UnicodeDecodeError") self.fail("Should have raised UnicodeDecodeError")
def test_conversion(self): def test_conversion(self):
# Make sure __unicode__() works properly # Make sure __unicode__() works properly
@ -1382,8 +1373,8 @@ class UnicodeTest(string_tests.CommonTest,
def __str__(self): def __str__(self):
return '__str__ overridden' return '__str__ overridden'
s = S('xxx') s = S('xxx')
self.assertEquals("%s" % s, '__str__ overridden') self.assertEqual("%s" % s, '__str__ overridden')
self.assertEquals("{}".format(s), '__str__ overridden') self.assertEqual("{}".format(s), '__str__ overridden')
def test_from_format(self): def test_from_format(self):
# Ensure that PyUnicode_FromFormat() raises an error for a non-ascii # Ensure that PyUnicode_FromFormat() raises an error for a non-ascii