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

Merge 3.5

This commit is contained in:
Victor Stinner 2016-03-01 22:07:53 +01:00
parent 3d9d77a3dc 337986740f
commit f2192855dd
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/test/test_unicode.py
View File

@ -341,16 +341,22 @@ class UnicodeTest(string_tests.CommonTest,
"[XXX]")
self.assertEqual("[a]".translate(str.maketrans({'a': '\xe9'})),
"[\xe9]")
self.assertEqual('axb'.translate(str.maketrans({'a': None, 'b': '123'})),
"x123")
self.assertEqual('axb'.translate(str.maketrans({'a': None, 'b': '\xe9'})),
"x\xe9")
# test non-ASCII (don't take the fast-path)
self.assertEqual("[a]".translate(str.maketrans({'a': '<\xe9>'})),
"[<\xe9>]")
self.assertEqual("[\xe9]".translate(str.maketrans({'\xe9': 'a'})),
"[a]")
self.assertEqual("[\xe9]".translate(str.maketrans({'\xe9': None})),
"[]")
self.assertEqual('axb'.translate(str.maketrans({'a': None, 'b': '123'})),
"x123")
self.assertEqual('axb'.translate(str.maketrans({'a': None, 'b': '\xe9'})),
"x\xe9")
self.assertEqual("[\xe9]".translate(str.maketrans({'\xe9': '123'})),
"[123]")
self.assertEqual("[a\xe9]".translate(str.maketrans({'a': '<\u20ac>'})),
"[<\u20ac>\xe9]")
# invalid Unicode characters
invalid_char = 0x10ffff+1

21
Objects/unicodeobject.c
View File

@ -8791,10 +8791,6 @@ unicode_fast_translate(PyObject *input, PyObject *mapping,
Py_UCS1 *in, *end, *out;
int res = 0;
if (PyUnicode_READY(input) == -1)
return -1;
if (!PyUnicode_IS_ASCII(input))
return 0;
len = PyUnicode_GET_LENGTH(input);
memset(ascii_table, 0xff, 128);
@ -8877,13 +8873,20 @@ _PyUnicode_TranslateCharmap(PyObject *input,
ignore = (errors != NULL && strcmp(errors, "ignore") == 0);
res = unicode_fast_translate(input, mapping, &writer, ignore, &i);
if (res < 0) {
_PyUnicodeWriter_Dealloc(&writer);
if (PyUnicode_READY(input) == -1)
return NULL;
if (PyUnicode_IS_ASCII(input)) {
res = unicode_fast_translate(input, mapping, &writer, ignore, &i);
if (res < 0) {
_PyUnicodeWriter_Dealloc(&writer);
return NULL;
}
if (res == 1)
return _PyUnicodeWriter_Finish(&writer);
}
else {
i = 0;
}
if (res == 1)
return _PyUnicodeWriter_Finish(&writer);
while (i<size) {
/* try to encode it */