Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Add a unicode prefix to the characters in the UnicodeEncodeError and 

UnicodeTranslateError message.
This commit is contained in:
Walter Dörwald 2003-08-12 17:34:49 +00:00
parent fd196bd263
commit a54b92b2eb
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/test/test_codeccallbacks.py
View File

@ -258,7 +258,7 @@ class CodecCallbackTest(unittest.TestCase):
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeEncodeError, UnicodeEncodeError,
["ascii", u"g\xfcrk", 1, 2, "ouch"], ["ascii", u"g\xfcrk", 1, 2, "ouch"],
"'ascii' codec can't encode character '\\xfc' in position 1: ouch" "'ascii' codec can't encode character u'\\xfc' in position 1: ouch"
) )
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeEncodeError, UnicodeEncodeError,
@ -268,23 +268,23 @@ class CodecCallbackTest(unittest.TestCase):
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeEncodeError, UnicodeEncodeError,
["ascii", u"\xfcx", 0, 1, "ouch"], ["ascii", u"\xfcx", 0, 1, "ouch"],
"'ascii' codec can't encode character '\\xfc' in position 0: ouch" "'ascii' codec can't encode character u'\\xfc' in position 0: ouch"
) )
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeEncodeError, UnicodeEncodeError,
["ascii", u"\u0100x", 0, 1, "ouch"], ["ascii", u"\u0100x", 0, 1, "ouch"],
"'ascii' codec can't encode character '\\u0100' in position 0: ouch" "'ascii' codec can't encode character u'\\u0100' in position 0: ouch"
) )
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeEncodeError, UnicodeEncodeError,
["ascii", u"\uffffx", 0, 1, "ouch"], ["ascii", u"\uffffx", 0, 1, "ouch"],
"'ascii' codec can't encode character '\\uffff' in position 0: ouch" "'ascii' codec can't encode character u'\\uffff' in position 0: ouch"
) )
if sys.maxunicode > 0xffff: if sys.maxunicode > 0xffff:
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeEncodeError, UnicodeEncodeError,
["ascii", u"\U00010000x", 0, 1, "ouch"], ["ascii", u"\U00010000x", 0, 1, "ouch"],
"'ascii' codec can't encode character '\\U00010000' in position 0: ouch" "'ascii' codec can't encode character u'\\U00010000' in position 0: ouch"
) )
def test_unicodedecodeerror(self): def test_unicodedecodeerror(self):
@ -303,23 +303,23 @@ class CodecCallbackTest(unittest.TestCase):
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeTranslateError, UnicodeTranslateError,
[u"g\xfcrk", 1, 2, "ouch"], [u"g\xfcrk", 1, 2, "ouch"],
"can't translate character '\\xfc' in position 1: ouch" "can't translate character u'\\xfc' in position 1: ouch"
) )
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeTranslateError, UnicodeTranslateError,
[u"g\u0100rk", 1, 2, "ouch"], [u"g\u0100rk", 1, 2, "ouch"],
"can't translate character '\\u0100' in position 1: ouch" "can't translate character u'\\u0100' in position 1: ouch"
) )
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeTranslateError, UnicodeTranslateError,
[u"g\uffffrk", 1, 2, "ouch"], [u"g\uffffrk", 1, 2, "ouch"],
"can't translate character '\\uffff' in position 1: ouch" "can't translate character u'\\uffff' in position 1: ouch"
) )
if sys.maxunicode > 0xffff: if sys.maxunicode > 0xffff:
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeTranslateError, UnicodeTranslateError,
[u"g\U00010000rk", 1, 2, "ouch"], [u"g\U00010000rk", 1, 2, "ouch"],
"can't translate character '\\U00010000' in position 1: ouch" "can't translate character u'\\U00010000' in position 1: ouch"
) )
self.check_exceptionobjectargs( self.check_exceptionobjectargs(
UnicodeTranslateError, UnicodeTranslateError,

12
Python/exceptions.c
View File

@ -1254,11 +1254,11 @@ UnicodeEncodeError__str__(PyObject *self, PyObject *arg)
int badchar = (int)PyUnicode_AS_UNICODE(objectObj)[start]; int badchar = (int)PyUnicode_AS_UNICODE(objectObj)[start];
char *format; char *format;
if (badchar <= 0xff) if (badchar <= 0xff)
format = "'%.400s' codec can't encode character '\\x%02x' in position %d: %.400s"; format = "'%.400s' codec can't encode character u'\\x%02x' in position %d: %.400s";
else if (badchar <= 0xffff) else if (badchar <= 0xffff)
format = "'%.400s' codec can't encode character '\\u%04x' in position %d: %.400s"; format = "'%.400s' codec can't encode character u'\\u%04x' in position %d: %.400s";
else else
format = "'%.400s' codec can't encode character '\\U%08x' in position %d: %.400s"; format = "'%.400s' codec can't encode character u'\\U%08x' in position %d: %.400s";
PyOS_snprintf(buffer, sizeof(buffer), PyOS_snprintf(buffer, sizeof(buffer),
format, format,
PyString_AS_STRING(encodingObj), PyString_AS_STRING(encodingObj),
@ -1449,11 +1449,11 @@ UnicodeTranslateError__str__(PyObject *self, PyObject *arg)
int badchar = (int)PyUnicode_AS_UNICODE(objectObj)[start]; int badchar = (int)PyUnicode_AS_UNICODE(objectObj)[start];
char *format; char *format;
if (badchar <= 0xff) if (badchar <= 0xff)
format = "can't translate character '\\x%02x' in position %d: %.400s"; format = "can't translate character u'\\x%02x' in position %d: %.400s";
else if (badchar <= 0xffff) else if (badchar <= 0xffff)
format = "can't translate character '\\u%04x' in position %d: %.400s"; format = "can't translate character u'\\u%04x' in position %d: %.400s";
else else
format = "can't translate character '\\U%08x' in position %d: %.400s"; format = "can't translate character u'\\U%08x' in position %d: %.400s";
PyOS_snprintf(buffer, sizeof(buffer), PyOS_snprintf(buffer, sizeof(buffer),
format, format,
badchar, badchar,