mirror of
https://github.com/python/cpython.git
synced 2025-10-09 08:31:26 +00:00
Rip out all the u"..." literals and calls to unicode().
This commit is contained in:
Guido van Rossum
parent
572dbf8f13
commit
ef87d6ed94
200 changed files with 18074 additions and 18074 deletions
|
|
@ -16,18 +16,18 @@ class PosReturn:
|
|||
# otherwise we'd get an endless loop
|
||||
if realpos <= exc.start:
|
||||
self.pos = len(exc.object)
|
||||
return (u"<?>", oldpos)
|
||||
return ("<?>", oldpos)
|
||||
|
||||
# A UnicodeEncodeError object with a bad start attribute
|
||||
class BadStartUnicodeEncodeError(UnicodeEncodeError):
|
||||
def __init__(self):
|
||||
UnicodeEncodeError.__init__(self, "ascii", u"", 0, 1, "bad")
|
||||
UnicodeEncodeError.__init__(self, "ascii", "", 0, 1, "bad")
|
||||
self.start = []
|
||||
|
||||
# A UnicodeEncodeError object with a bad object attribute
|
||||
class BadObjectUnicodeEncodeError(UnicodeEncodeError):
|
||||
def __init__(self):
|
||||
UnicodeEncodeError.__init__(self, "ascii", u"", 0, 1, "bad")
|
||||
UnicodeEncodeError.__init__(self, "ascii", "", 0, 1, "bad")
|
||||
self.object = []
|
||||
|
||||
# A UnicodeDecodeError object without an end attribute
|
||||
|
|
@ -45,19 +45,19 @@ class BadObjectUnicodeDecodeError(UnicodeDecodeError):
|
|||
# A UnicodeTranslateError object without a start attribute
|
||||
class NoStartUnicodeTranslateError(UnicodeTranslateError):
|
||||
def __init__(self):
|
||||
UnicodeTranslateError.__init__(self, u"", 0, 1, "bad")
|
||||
UnicodeTranslateError.__init__(self, "", 0, 1, "bad")
|
||||
del self.start
|
||||
|
||||
# A UnicodeTranslateError object without an end attribute
|
||||
class NoEndUnicodeTranslateError(UnicodeTranslateError):
|
||||
def __init__(self):
|
||||
UnicodeTranslateError.__init__(self, u"", 0, 1, "bad")
|
||||
UnicodeTranslateError.__init__(self, "", 0, 1, "bad")
|
||||
del self.end
|
||||
|
||||
# A UnicodeTranslateError object without an object attribute
|
||||
class NoObjectUnicodeTranslateError(UnicodeTranslateError):
|
||||
def __init__(self):
|
||||
UnicodeTranslateError.__init__(self, u"", 0, 1, "bad")
|
||||
UnicodeTranslateError.__init__(self, "", 0, 1, "bad")
|
||||
del self.object
|
||||
|
||||
class CodecCallbackTest(unittest.TestCase):
|
||||
|
|
@ -66,7 +66,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
# replace unencodable characters which numeric character entities.
|
||||
# For ascii, latin-1 and charmaps this is completely implemented
|
||||
# in C and should be reasonably fast.
|
||||
s = u"\u30b9\u30d1\u30e2 \xe4nd eggs"
|
||||
s = "\u30b9\u30d1\u30e2 \xe4nd eggs"
|
||||
self.assertEqual(
|
||||
s.encode("ascii", "xmlcharrefreplace"),
|
||||
"スパモ änd eggs"
|
||||
|
|
@ -86,15 +86,15 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
l = []
|
||||
for c in exc.object[exc.start:exc.end]:
|
||||
try:
|
||||
l.append(u"&%s;" % htmlentitydefs.codepoint2name[ord(c)])
|
||||
l.append("&%s;" % htmlentitydefs.codepoint2name[ord(c)])
|
||||
except KeyError:
|
||||
l.append(u"&#%d;" % ord(c))
|
||||
return (u"".join(l), exc.end)
|
||||
l.append("&#%d;" % ord(c))
|
||||
return ("".join(l), exc.end)
|
||||
|
||||
codecs.register_error(
|
||||
"test.xmlcharnamereplace", xmlcharnamereplace)
|
||||
|
||||
sin = u"\xab\u211c\xbb = \u2329\u1234\u20ac\u232a"
|
||||
sin = "\xab\u211c\xbb = \u2329\u1234\u20ac\u232a"
|
||||
sout = "«ℜ» = ⟨ሴ€⟩"
|
||||
self.assertEqual(sin.encode("ascii", "test.xmlcharnamereplace"), sout)
|
||||
sout = "\xabℜ\xbb = ⟨ሴ€⟩"
|
||||
|
|
@ -116,13 +116,13 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
raise TypeError("don't know how to handle %r" % exc)
|
||||
l = []
|
||||
for c in exc.object[exc.start:exc.end]:
|
||||
l.append(unicodedata.name(c, u"0x%x" % ord(c)))
|
||||
return (u"\033[1m%s\033[0m" % u", ".join(l), exc.end)
|
||||
l.append(unicodedata.name(c, "0x%x" % ord(c)))
|
||||
return ("\033[1m%s\033[0m" % ", ".join(l), exc.end)
|
||||
|
||||
codecs.register_error(
|
||||
"test.uninamereplace", uninamereplace)
|
||||
|
||||
sin = u"\xac\u1234\u20ac\u8000"
|
||||
sin = "\xac\u1234\u20ac\u8000"
|
||||
sout = "\033[1mNOT SIGN, ETHIOPIC SYLLABLE SEE, EURO SIGN, CJK UNIFIED IDEOGRAPH-8000\033[0m"
|
||||
self.assertEqual(sin.encode("ascii", "test.uninamereplace"), sout)
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
def test_backslashescape(self):
|
||||
# Does the same as the "unicode-escape" encoding, but with different
|
||||
# base encodings.
|
||||
sin = u"a\xac\u1234\u20ac\u8000"
|
||||
sin = "a\xac\u1234\u20ac\u8000"
|
||||
if sys.maxunicode > 0xffff:
|
||||
sin += unichr(sys.maxunicode)
|
||||
sout = "a\\xac\\u1234\\u20ac\\u8000"
|
||||
|
|
@ -163,7 +163,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
if not isinstance(exc, UnicodeDecodeError):
|
||||
raise TypeError("don't know how to handle %r" % exc)
|
||||
if exc.object[exc.start:exc.end].startswith("\xc0\x80"):
|
||||
return (u"\x00", exc.start+2) # retry after two bytes
|
||||
return ("\x00", exc.start+2) # retry after two bytes
|
||||
else:
|
||||
raise exc
|
||||
|
||||
|
|
@ -171,7 +171,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
"test.relaxedutf8", relaxedutf8)
|
||||
|
||||
sin = "a\x00b\xc0\x80c\xc3\xbc\xc0\x80\xc0\x80"
|
||||
sout = u"a\x00b\x00c\xfc\x00\x00"
|
||||
sout = "a\x00b\x00c\xfc\x00\x00"
|
||||
self.assertEqual(sin.decode("utf-8", "test.relaxedutf8"), sout)
|
||||
sin = "\xc0\x80\xc0\x81"
|
||||
self.assertRaises(UnicodeError, sin.decode, "utf-8", "test.relaxedutf8")
|
||||
|
|
@ -182,22 +182,22 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
# to be able to use e.g. the "replace" handler, the
|
||||
# charmap has to have a mapping for "?".
|
||||
charmap = dict([ (ord(c), 2*c.upper()) for c in "abcdefgh"])
|
||||
sin = u"abc"
|
||||
sin = "abc"
|
||||
sout = "AABBCC"
|
||||
self.assertEquals(codecs.charmap_encode(sin, "strict", charmap)[0], sout)
|
||||
|
||||
sin = u"abcA"
|
||||
sin = "abcA"
|
||||
self.assertRaises(UnicodeError, codecs.charmap_encode, sin, "strict", charmap)
|
||||
|
||||
charmap[ord("?")] = "XYZ"
|
||||
sin = u"abcDEF"
|
||||
sin = "abcDEF"
|
||||
sout = "AABBCCXYZXYZXYZ"
|
||||
self.assertEquals(codecs.charmap_encode(sin, "replace", charmap)[0], sout)
|
||||
|
||||
charmap[ord("?")] = u"XYZ"
|
||||
charmap[ord("?")] = "XYZ"
|
||||
self.assertRaises(TypeError, codecs.charmap_encode, sin, "replace", charmap)
|
||||
|
||||
charmap[ord("?")] = u"XYZ"
|
||||
charmap[ord("?")] = "XYZ"
|
||||
self.assertRaises(TypeError, codecs.charmap_encode, sin, "replace", charmap)
|
||||
|
||||
def test_decodeunicodeinternal(self):
|
||||
|
|
@ -210,23 +210,23 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
def handler_unicodeinternal(exc):
|
||||
if not isinstance(exc, UnicodeDecodeError):
|
||||
raise TypeError("don't know how to handle %r" % exc)
|
||||
return (u"\x01", 1)
|
||||
return ("\x01", 1)
|
||||
|
||||
self.assertEqual(
|
||||
"\x00\x00\x00\x00\x00".decode("unicode-internal", "ignore"),
|
||||
u"\u0000"
|
||||
"\u0000"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
"\x00\x00\x00\x00\x00".decode("unicode-internal", "replace"),
|
||||
u"\u0000\ufffd"
|
||||
"\u0000\ufffd"
|
||||
)
|
||||
|
||||
codecs.register_error("test.hui", handler_unicodeinternal)
|
||||
|
||||
self.assertEqual(
|
||||
"\x00\x00\x00\x00\x00".decode("unicode-internal", "test.hui"),
|
||||
u"\u0000\u0001\u0000"
|
||||
"\u0000\u0001\u0000"
|
||||
)
|
||||
|
||||
def test_callbacks(self):
|
||||
|
|
@ -234,16 +234,16 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
if not isinstance(exc, UnicodeEncodeError) \
|
||||
and not isinstance(exc, UnicodeDecodeError):
|
||||
raise TypeError("don't know how to handle %r" % exc)
|
||||
l = [u"<%d>" % ord(exc.object[pos]) for pos in xrange(exc.start, exc.end)]
|
||||
return (u"[%s]" % u"".join(l), exc.end)
|
||||
l = ["<%d>" % ord(exc.object[pos]) for pos in xrange(exc.start, exc.end)]
|
||||
return ("[%s]" % "".join(l), exc.end)
|
||||
|
||||
codecs.register_error("test.handler1", handler1)
|
||||
|
||||
def handler2(exc):
|
||||
if not isinstance(exc, UnicodeDecodeError):
|
||||
raise TypeError("don't know how to handle %r" % exc)
|
||||
l = [u"<%d>" % ord(exc.object[pos]) for pos in xrange(exc.start, exc.end)]
|
||||
return (u"[%s]" % u"".join(l), exc.end+1) # skip one character
|
||||
l = ["<%d>" % ord(exc.object[pos]) for pos in xrange(exc.start, exc.end)]
|
||||
return ("[%s]" % "".join(l), exc.end+1) # skip one character
|
||||
|
||||
codecs.register_error("test.handler2", handler2)
|
||||
|
||||
|
|
@ -251,36 +251,36 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
self.assertEqual(
|
||||
s.decode("ascii", "test.handler1"),
|
||||
u"\x00[<129>]\x7f[<128>][<255>]"
|
||||
"\x00[<129>]\x7f[<128>][<255>]"
|
||||
)
|
||||
self.assertEqual(
|
||||
s.decode("ascii", "test.handler2"),
|
||||
u"\x00[<129>][<128>]"
|
||||
"\x00[<129>][<128>]"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
"\\u3042\u3xxx".decode("unicode-escape", "test.handler1"),
|
||||
u"\u3042[<92><117><51><120>]xx"
|
||||
"\u3042[<92><117><51><120>]xx"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
"\\u3042\u3xx".decode("unicode-escape", "test.handler1"),
|
||||
u"\u3042[<92><117><51><120><120>]"
|
||||
"\u3042[<92><117><51><120><120>]"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode("abc", "test.handler1", {ord("a"): u"z"})[0],
|
||||
u"z[<98>][<99>]"
|
||||
codecs.charmap_decode("abc", "test.handler1", {ord("a"): "z"})[0],
|
||||
"z[<98>][<99>]"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
u"g\xfc\xdfrk".encode("ascii", "test.handler1"),
|
||||
u"g[<252><223>]rk"
|
||||
"g\xfc\xdfrk".encode("ascii", "test.handler1"),
|
||||
"g[<252><223>]rk"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
u"g\xfc\xdf".encode("ascii", "test.handler1"),
|
||||
u"g[<252><223>]"
|
||||
"g\xfc\xdf".encode("ascii", "test.handler1"),
|
||||
"g[<252><223>]"
|
||||
)
|
||||
|
||||
def test_longstrings(self):
|
||||
|
|
@ -292,7 +292,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
codecs.register_error("test." + err, codecs.lookup_error(err))
|
||||
l = 1000
|
||||
errors += [ "test." + err for err in errors ]
|
||||
for uni in [ s*l for s in (u"x", u"\u3042", u"a\xe4") ]:
|
||||
for uni in [ s*l for s in ("x", "\u3042", "a\xe4") ]:
|
||||
for enc in ("ascii", "latin-1", "iso-8859-1", "iso-8859-15", "utf-8", "utf-7", "utf-16"):
|
||||
for err in errors:
|
||||
try:
|
||||
|
|
@ -307,7 +307,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
# check with one argument too much
|
||||
self.assertRaises(TypeError, exctype, *(args + ["too much"]))
|
||||
# check with one argument of the wrong type
|
||||
wrongargs = [ "spam", u"eggs", 42, 1.0, None ]
|
||||
wrongargs = [ "spam", "eggs", 42, 1.0, None ]
|
||||
for i in xrange(len(args)):
|
||||
for wrongarg in wrongargs:
|
||||
if type(wrongarg) is type(args[i]):
|
||||
|
|
@ -328,33 +328,33 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
def test_unicodeencodeerror(self):
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeEncodeError,
|
||||
["ascii", u"g\xfcrk", 1, 2, "ouch"],
|
||||
["ascii", "g\xfcrk", 1, 2, "ouch"],
|
||||
"'ascii' codec can't encode character u'\\xfc' in position 1: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeEncodeError,
|
||||
["ascii", u"g\xfcrk", 1, 4, "ouch"],
|
||||
["ascii", "g\xfcrk", 1, 4, "ouch"],
|
||||
"'ascii' codec can't encode characters in position 1-3: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeEncodeError,
|
||||
["ascii", u"\xfcx", 0, 1, "ouch"],
|
||||
["ascii", "\xfcx", 0, 1, "ouch"],
|
||||
"'ascii' codec can't encode character u'\\xfc' in position 0: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeEncodeError,
|
||||
["ascii", u"\u0100x", 0, 1, "ouch"],
|
||||
["ascii", "\u0100x", 0, 1, "ouch"],
|
||||
"'ascii' codec can't encode character u'\\u0100' in position 0: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeEncodeError,
|
||||
["ascii", u"\uffffx", 0, 1, "ouch"],
|
||||
["ascii", "\uffffx", 0, 1, "ouch"],
|
||||
"'ascii' codec can't encode character u'\\uffff' in position 0: ouch"
|
||||
)
|
||||
if sys.maxunicode > 0xffff:
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeEncodeError,
|
||||
["ascii", u"\U00010000x", 0, 1, "ouch"],
|
||||
["ascii", "\U00010000x", 0, 1, "ouch"],
|
||||
"'ascii' codec can't encode character u'\\U00010000' in position 0: ouch"
|
||||
)
|
||||
|
||||
|
|
@ -373,28 +373,28 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
def test_unicodetranslateerror(self):
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeTranslateError,
|
||||
[u"g\xfcrk", 1, 2, "ouch"],
|
||||
["g\xfcrk", 1, 2, "ouch"],
|
||||
"can't translate character u'\\xfc' in position 1: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeTranslateError,
|
||||
[u"g\u0100rk", 1, 2, "ouch"],
|
||||
["g\u0100rk", 1, 2, "ouch"],
|
||||
"can't translate character u'\\u0100' in position 1: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeTranslateError,
|
||||
[u"g\uffffrk", 1, 2, "ouch"],
|
||||
["g\uffffrk", 1, 2, "ouch"],
|
||||
"can't translate character u'\\uffff' in position 1: ouch"
|
||||
)
|
||||
if sys.maxunicode > 0xffff:
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeTranslateError,
|
||||
[u"g\U00010000rk", 1, 2, "ouch"],
|
||||
["g\U00010000rk", 1, 2, "ouch"],
|
||||
"can't translate character u'\\U00010000' in position 1: ouch"
|
||||
)
|
||||
self.check_exceptionobjectargs(
|
||||
UnicodeTranslateError,
|
||||
[u"g\xfcrk", 1, 3, "ouch"],
|
||||
["g\xfcrk", 1, 3, "ouch"],
|
||||
"can't translate characters in position 1-2: ouch"
|
||||
)
|
||||
|
||||
|
|
@ -416,7 +416,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
self.assertRaises(
|
||||
UnicodeEncodeError,
|
||||
codecs.strict_errors,
|
||||
UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")
|
||||
UnicodeEncodeError("ascii", "\u3042", 0, 1, "ouch")
|
||||
)
|
||||
|
||||
def test_badandgoodignoreexceptions(self):
|
||||
|
|
@ -434,16 +434,16 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
)
|
||||
# If the correct exception is passed in, "ignore" returns an empty replacement
|
||||
self.assertEquals(
|
||||
codecs.ignore_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
|
||||
(u"", 1)
|
||||
codecs.ignore_errors(UnicodeEncodeError("ascii", "\u3042", 0, 1, "ouch")),
|
||||
("", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.ignore_errors(UnicodeDecodeError("ascii", "\xff", 0, 1, "ouch")),
|
||||
(u"", 1)
|
||||
("", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.ignore_errors(UnicodeTranslateError(u"\u3042", 0, 1, "ouch")),
|
||||
(u"", 1)
|
||||
codecs.ignore_errors(UnicodeTranslateError("\u3042", 0, 1, "ouch")),
|
||||
("", 1)
|
||||
)
|
||||
|
||||
def test_badandgoodreplaceexceptions(self):
|
||||
|
|
@ -471,16 +471,16 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
)
|
||||
# With the correct exception, "replace" returns an "?" or u"\ufffd" replacement
|
||||
self.assertEquals(
|
||||
codecs.replace_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
|
||||
(u"?", 1)
|
||||
codecs.replace_errors(UnicodeEncodeError("ascii", "\u3042", 0, 1, "ouch")),
|
||||
("?", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.replace_errors(UnicodeDecodeError("ascii", "\xff", 0, 1, "ouch")),
|
||||
(u"\ufffd", 1)
|
||||
("\ufffd", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.replace_errors(UnicodeTranslateError(u"\u3042", 0, 1, "ouch")),
|
||||
(u"\ufffd", 1)
|
||||
codecs.replace_errors(UnicodeTranslateError("\u3042", 0, 1, "ouch")),
|
||||
("\ufffd", 1)
|
||||
)
|
||||
|
||||
def test_badandgoodxmlcharrefreplaceexceptions(self):
|
||||
|
|
@ -505,7 +505,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
self.assertRaises(
|
||||
TypeError,
|
||||
codecs.xmlcharrefreplace_errors,
|
||||
UnicodeTranslateError(u"\u3042", 0, 1, "ouch")
|
||||
UnicodeTranslateError("\u3042", 0, 1, "ouch")
|
||||
)
|
||||
# Use the correct exception
|
||||
cs = (0, 1, 9, 10, 99, 100, 999, 1000, 9999, 10000, 0x3042)
|
||||
|
|
@ -514,7 +514,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
codecs.xmlcharrefreplace_errors(
|
||||
UnicodeEncodeError("ascii", s, 0, len(s), "ouch")
|
||||
),
|
||||
(u"".join(u"&#%d;" % ord(c) for c in s), len(s))
|
||||
("".join("&#%d;" % ord(c) for c in s), len(s))
|
||||
)
|
||||
|
||||
def test_badandgoodbackslashreplaceexceptions(self):
|
||||
|
|
@ -539,41 +539,41 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
self.assertRaises(
|
||||
TypeError,
|
||||
codecs.backslashreplace_errors,
|
||||
UnicodeTranslateError(u"\u3042", 0, 1, "ouch")
|
||||
UnicodeTranslateError("\u3042", 0, 1, "ouch")
|
||||
)
|
||||
# Use the correct exception
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
|
||||
(u"\\u3042", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\u3042", 0, 1, "ouch")),
|
||||
("\\u3042", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\x00", 0, 1, "ouch")),
|
||||
(u"\\x00", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\x00", 0, 1, "ouch")),
|
||||
("\\x00", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\xff", 0, 1, "ouch")),
|
||||
(u"\\xff", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\xff", 0, 1, "ouch")),
|
||||
("\\xff", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\u0100", 0, 1, "ouch")),
|
||||
(u"\\u0100", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\u0100", 0, 1, "ouch")),
|
||||
("\\u0100", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\uffff", 0, 1, "ouch")),
|
||||
(u"\\uffff", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\uffff", 0, 1, "ouch")),
|
||||
("\\uffff", 1)
|
||||
)
|
||||
if sys.maxunicode>0xffff:
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\U00010000", 0, 1, "ouch")),
|
||||
(u"\\U00010000", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\U00010000", 0, 1, "ouch")),
|
||||
("\\U00010000", 1)
|
||||
)
|
||||
self.assertEquals(
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", u"\U0010ffff", 0, 1, "ouch")),
|
||||
(u"\\U0010ffff", 1)
|
||||
codecs.backslashreplace_errors(UnicodeEncodeError("ascii", "\U0010ffff", 0, 1, "ouch")),
|
||||
("\\U0010ffff", 1)
|
||||
)
|
||||
|
||||
def test_badhandlerresults(self):
|
||||
results = ( 42, u"foo", (1,2,3), (u"foo", 1, 3), (u"foo", None), (u"foo",), ("foo", 1, 3), ("foo", None), ("foo",) )
|
||||
results = ( 42, "foo", (1,2,3), ("foo", 1, 3), ("foo", None), ("foo",), ("foo", 1, 3), ("foo", None), ("foo",) )
|
||||
encs = ("ascii", "latin-1", "iso-8859-1", "iso-8859-15")
|
||||
|
||||
for res in results:
|
||||
|
|
@ -581,7 +581,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
for enc in encs:
|
||||
self.assertRaises(
|
||||
TypeError,
|
||||
u"\u3042".encode,
|
||||
"\u3042".encode,
|
||||
enc,
|
||||
"test.badhandler"
|
||||
)
|
||||
|
|
@ -614,14 +614,14 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
def test_unencodablereplacement(self):
|
||||
def unencrepl(exc):
|
||||
if isinstance(exc, UnicodeEncodeError):
|
||||
return (u"\u4242", exc.end)
|
||||
return ("\u4242", exc.end)
|
||||
else:
|
||||
raise TypeError("don't know how to handle %r" % exc)
|
||||
codecs.register_error("test.unencreplhandler", unencrepl)
|
||||
for enc in ("ascii", "iso-8859-1", "iso-8859-15"):
|
||||
self.assertRaises(
|
||||
UnicodeEncodeError,
|
||||
u"\u4242".encode,
|
||||
"\u4242".encode,
|
||||
enc,
|
||||
"test.unencreplhandler"
|
||||
)
|
||||
|
|
@ -650,7 +650,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
v = (1, 5, 10, 50, 100, 500, 1000, 5000, 10000, 50000)
|
||||
if sys.maxunicode>=100000:
|
||||
v += (100000, 500000, 1000000)
|
||||
s = u"".join([unichr(x) for x in v])
|
||||
s = "".join([unichr(x) for x in v])
|
||||
codecs.register_error("test.xmlcharrefreplace", codecs.xmlcharrefreplace_errors)
|
||||
for enc in ("ascii", "iso-8859-15"):
|
||||
for err in ("xmlcharrefreplace", "test.xmlcharrefreplace"):
|
||||
|
|
@ -673,7 +673,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
self.assertRaises(TypeError, "\\uyyyy".decode, "raw-unicode-escape", "test.baddecodereturn1")
|
||||
|
||||
def baddecodereturn2(exc):
|
||||
return (u"?", None)
|
||||
return ("?", None)
|
||||
codecs.register_error("test.baddecodereturn2", baddecodereturn2)
|
||||
self.assertRaises(TypeError, "\xff".decode, "ascii", "test.baddecodereturn2")
|
||||
|
||||
|
|
@ -682,11 +682,11 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Valid negative position
|
||||
handler.pos = -1
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?>0")
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), "<?>0")
|
||||
|
||||
# Valid negative position
|
||||
handler.pos = -2
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?><?>")
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), "<?><?>")
|
||||
|
||||
# Negative position out of bounds
|
||||
handler.pos = -3
|
||||
|
|
@ -694,11 +694,11 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Valid positive position
|
||||
handler.pos = 1
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?>0")
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), "<?>0")
|
||||
|
||||
# Largest valid positive position (one beyond end of input)
|
||||
handler.pos = 2
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), u"<?>")
|
||||
self.assertEquals("\xff0".decode("ascii", "test.posreturn"), "<?>")
|
||||
|
||||
# Invalid positive position
|
||||
handler.pos = 3
|
||||
|
|
@ -706,7 +706,7 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
|
||||
# Restart at the "0"
|
||||
handler.pos = 6
|
||||
self.assertEquals("\\uyyyy0".decode("raw-unicode-escape", "test.posreturn"), u"<?>0")
|
||||
self.assertEquals("\\uyyyy0".decode("raw-unicode-escape", "test.posreturn"), "<?>0")
|
||||
|
||||
class D(dict):
|
||||
def __getitem__(self, key):
|
||||
|
|
@ -719,44 +719,44 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
# enhance coverage of:
|
||||
# Objects/unicodeobject.c::unicode_encode_call_errorhandler()
|
||||
# and callers
|
||||
self.assertRaises(LookupError, u"\xff".encode, "ascii", "test.unknown")
|
||||
self.assertRaises(LookupError, "\xff".encode, "ascii", "test.unknown")
|
||||
|
||||
def badencodereturn1(exc):
|
||||
return 42
|
||||
codecs.register_error("test.badencodereturn1", badencodereturn1)
|
||||
self.assertRaises(TypeError, u"\xff".encode, "ascii", "test.badencodereturn1")
|
||||
self.assertRaises(TypeError, "\xff".encode, "ascii", "test.badencodereturn1")
|
||||
|
||||
def badencodereturn2(exc):
|
||||
return (u"?", None)
|
||||
return ("?", None)
|
||||
codecs.register_error("test.badencodereturn2", badencodereturn2)
|
||||
self.assertRaises(TypeError, u"\xff".encode, "ascii", "test.badencodereturn2")
|
||||
self.assertRaises(TypeError, "\xff".encode, "ascii", "test.badencodereturn2")
|
||||
|
||||
handler = PosReturn()
|
||||
codecs.register_error("test.posreturn", handler.handle)
|
||||
|
||||
# Valid negative position
|
||||
handler.pos = -1
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
self.assertEquals("\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
|
||||
# Valid negative position
|
||||
handler.pos = -2
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?><?>")
|
||||
self.assertEquals("\xff0".encode("ascii", "test.posreturn"), "<?><?>")
|
||||
|
||||
# Negative position out of bounds
|
||||
handler.pos = -3
|
||||
self.assertRaises(IndexError, u"\xff0".encode, "ascii", "test.posreturn")
|
||||
self.assertRaises(IndexError, "\xff0".encode, "ascii", "test.posreturn")
|
||||
|
||||
# Valid positive position
|
||||
handler.pos = 1
|
||||
self.assertEquals(u"\xff0".encode("ascii", "test.posreturn"), "<?>0")
|
||||
self.assertEquals("\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.assertEquals("\xff0".encode("ascii", "test.posreturn"), "<?>")
|
||||
|
||||
# Invalid positive position
|
||||
handler.pos = 3
|
||||
self.assertRaises(IndexError, u"\xff0".encode, "ascii", "test.posreturn")
|
||||
self.assertRaises(IndexError, "\xff0".encode, "ascii", "test.posreturn")
|
||||
|
||||
handler.pos = 0
|
||||
|
||||
|
|
@ -764,9 +764,9 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
def __getitem__(self, key):
|
||||
raise ValueError
|
||||
for err in ("strict", "replace", "xmlcharrefreplace", "backslashreplace", "test.posreturn"):
|
||||
self.assertRaises(UnicodeError, codecs.charmap_encode, u"\xff", err, {0xff: None})
|
||||
self.assertRaises(ValueError, codecs.charmap_encode, u"\xff", err, D())
|
||||
self.assertRaises(TypeError, codecs.charmap_encode, u"\xff", err, {0xff: 300})
|
||||
self.assertRaises(UnicodeError, codecs.charmap_encode, "\xff", err, {0xff: None})
|
||||
self.assertRaises(ValueError, codecs.charmap_encode, "\xff", err, D())
|
||||
self.assertRaises(TypeError, codecs.charmap_encode, "\xff", err, {0xff: 300})
|
||||
|
||||
def test_translatehelper(self):
|
||||
# enhance coverage of:
|
||||
|
|
@ -777,20 +777,20 @@ class CodecCallbackTest(unittest.TestCase):
|
|||
class D(dict):
|
||||
def __getitem__(self, key):
|
||||
raise ValueError
|
||||
self.assertRaises(ValueError, u"\xff".translate, D())
|
||||
self.assertRaises(TypeError, u"\xff".translate, {0xff: sys.maxunicode+1})
|
||||
self.assertRaises(TypeError, u"\xff".translate, {0xff: ()})
|
||||
self.assertRaises(ValueError, "\xff".translate, D())
|
||||
self.assertRaises(TypeError, "\xff".translate, {0xff: sys.maxunicode+1})
|
||||
self.assertRaises(TypeError, "\xff".translate, {0xff: ()})
|
||||
|
||||
def test_bug828737(self):
|
||||
charmap = {
|
||||
ord("&"): u"&",
|
||||
ord("<"): u"<",
|
||||
ord(">"): u">",
|
||||
ord('"'): u""",
|
||||
ord("&"): "&",
|
||||
ord("<"): "<",
|
||||
ord(">"): ">",
|
||||
ord('"'): """,
|
||||
}
|
||||
|
||||
for n in (1, 10, 100, 1000):
|
||||
text = u'abc<def>ghi'*n
|
||||
text = 'abc<def>ghi'*n
|
||||
text.translate(charmap)
|
||||
|
||||
def test_main():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue