mirror of
https://github.com/python/cpython.git
synced 2025-11-25 04:34:37 +00:00
Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........
This commit is contained in:
Ezio Melotti
parent
40a92f5c65
commit
2623a37852
184 changed files with 2328 additions and 2326 deletions
|
|
@ -186,7 +186,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
charmap = dict([ (ord(c), 2*c.upper()) for c in "abcdefgh"])
|
||||
sin = u"abc"
|
||||
sout = "AABBCC"
|
||||
self.assertEquals(codecs.charmap_encode(sin, "strict", charmap)[0], sout)
|
||||
self.assertEqual(codecs.charmap_encode(sin, "strict", charmap)[0], sout)
|
||||
|
||||
sin = u"abcA"
|
||||
self.assertRaises(UnicodeError, codecs.charmap_encode, sin, "strict", charmap)
|
||||
|
|
@ -194,7 +194,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
charmap[ord("?")] = "XYZ"
|
||||
sin = u"abcDEF"
|
||||
sout = "AABBCCXYZXYZXYZ"
|
||||
self.assertEquals(codecs.charmap_encode(sin, "replace", charmap)[0], sout)
|
||||
self.assertEqual(codecs.charmap_encode(sin, "replace", charmap)[0], sout)
|
||||
|
||||
charmap[ord("?")] = u"XYZ"
|
||||
self.assertRaises(TypeError, codecs.charmap_encode, sin, "replace", charmap)
|
||||
|
|
@ -327,7 +327,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# check with the correct number and type of arguments
|
||||
exc = exctype(*args)
|
||||
self.assertEquals(str(exc), msg)
|
||||
self.assertEqual(str(exc), msg)
|
||||
|
||||
def test_unicodeencodeerror(self):
|
||||
self.check_exceptionobjectargs(
|
||||
|
|
@ -437,15 +437,15 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
UnicodeError("ouch")
|
||||
)
|
||||
# If the correct exception is passed in, "ignore" returns an empty replacement
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.ignore_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
|
||||
(u"", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.ignore_errors(UnicodeDecodeError("ascii", "\xff", 0, 1, "ouch")),
|
||||
(u"", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.ignore_errors(UnicodeTranslateError(u"\u3042", 0, 1, "ouch")),
|
||||
(u"", 1)
|
||||
)
|
||||
|
|
@ -474,15 +474,15 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
BadObjectUnicodeDecodeError()
|
||||
)
|
||||
# With the correct exception, "replace" returns an "?" or u"\ufffd" replacement
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.replace_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
|
||||
(u"?", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.replace_errors(UnicodeDecodeError("ascii", "\xff", 0, 1, "ouch")),
|
||||
(u"\ufffd", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.replace_errors(UnicodeTranslateError(u"\u3042", 0, 1, "ouch")),
|
||||
(u"\ufffd", 1)
|
||||
)
|
||||
|
|
@ -514,7 +514,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
# Use the correct exception
|
||||
cs = (0, 1, 9, 10, 99, 100, 999, 1000, 9999, 10000, 0x3042)
|
||||
s = "".join(unichr(c) for c in cs)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.xmlcharrefreplace_errors(
|
||||
UnicodeEncodeError("ascii", s, 0, len(s), "ouch")
|
||||
),
|
||||
|
|
@ -546,32 +546,32 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
UnicodeTranslateError(u"\u3042", 0, 1, "ouch")
|
||||
)
|
||||
# Use the correct exception
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
|
||||
(u"\\u3042", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\x00", 0, 1, "ouch")),
|
||||
(u"\\x00", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\xff", 0, 1, "ouch")),
|
||||
(u"\\xff", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\u0100", 0, 1, "ouch")),
|
||||
(u"\\u0100", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\uffff", 0, 1, "ouch")),
|
||||
(u"\\uffff", 1)
|
||||
)
|
||||
if sys.maxunicode>0xffff:
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\U00010000", 0, 1, "ouch")),
|
||||
(u"\\U00010000", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\U0010ffff", 0, 1, "ouch")),
|
||||
(u"\\U0010ffff", 1)
|
||||
)
|
||||
|
|
@ -603,14 +603,14 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
)
|
||||
|
||||
def test_lookup(self):
|
||||
self.assertEquals(codecs.strict_errors, codecs.lookup_error("strict"))
|
||||
self.assertEquals(codecs.ignore_errors, codecs.lookup_error("ignore"))
|
||||
self.assertEquals(codecs.strict_errors, codecs.lookup_error("strict"))
|
||||
self.assertEquals(
|
||||
self.assertEqual(codecs.strict_errors, codecs.lookup_error("strict"))
|
||||
self.assertEqual(codecs.ignore_errors, codecs.lookup_error("ignore"))
|
||||
self.assertEqual(codecs.strict_errors, codecs.lookup_error("strict"))
|
||||
self.assertEqual(
|
||||
codecs.xmlcharrefreplace_errors,
|
||||
codecs.lookup_error("xmlcharrefreplace")
|
||||
)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
codecs.backslashreplace_errors,
|
||||
codecs.lookup_error("backslashreplace")
|
||||
)
|
||||
|
|
@ -686,11 +686,11 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Valid negative position
|
||||
handler.pos = -1
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?>0")
|
||||
self.assertEqual("\xff0".decode("ascii", "test.posreturn"), u"<?>0")
|
||||
|
||||
# Valid negative position
|
||||
handler.pos = -2
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?><?>")
|
||||
self.assertEqual("\xff0".decode("ascii", "test.posreturn"), u"<?><?>")
|
||||
|
||||
# Negative position out of bounds
|
||||
handler.pos = -3
|
||||
|
|
@ -698,11 +698,11 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Valid positive position
|
||||
handler.pos = 1
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?>0")
|
||||
self.assertEqual("\xff0".decode("ascii", "test.posreturn"), u"<?>0")
|
||||
|
||||
# Largest valid positive position (one beyond end of input)
|
||||
handler.pos = 2
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?>")
|
||||
self.assertEqual("\xff0".decode("ascii", "test.posreturn"), u"<?>")
|
||||
|
||||
# Invalid positive position
|
||||
handler.pos = 3
|
||||
|
|
@ -710,7 +710,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Restart at the "0"
|
||||
handler.pos = 6
|
||||
self.assertEquals("\\uyyyy0".decode("raw-unicode-escape", "test.posreturn"), u"<?>0")
|
||||
self.assertEqual("\\uyyyy0".decode("raw-unicode-escape", "test.posreturn"), u"<?>0")
|
||||
|
||||
class D(dict):
|
||||
def __getitem__(self, key):
|
||||
|
|
@ -740,11 +740,11 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Valid negative position
|
||||
handler.pos = -1
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
self.assertEqual(u"\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
|
||||
# Valid negative position
|
||||
handler.pos = -2
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?><?>")
|
||||
self.assertEqual(u"\xff0".encode("ascii", "test.posreturn"), "<?><?>")
|
||||
|
||||
# Negative position out of bounds
|
||||
handler.pos = -3
|
||||
|
|
@ -752,11 +752,11 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Valid positive position
|
||||
handler.pos = 1
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
self.assertEqual(u"\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
|
||||
# Largest valid positive position (one beyond end of input
|
||||
handler.pos = 2
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?>")
|
||||
self.assertEqual(u"\xff0".encode("ascii", "test.posreturn"), "<?>")
|
||||
|
||||
# Invalid positive position
|
||||
handler.pos = 3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue