mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Ensure that 1-char singletons get used

Browse source
This commit is contained in:
Antoine Pitrou 2011-10-06 22:07:51 +02:00
parent 8ac582f746
commit 7c46da7993
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/unicodeobject.c
View file

@ -1622,6 +1622,8 @@ unicode_fromascii(const unsigned char* s, Py_ssize_t size)
assert(*p < 128); assert(*p < 128);
} }
#endif #endif
if (size == 1)
return get_latin1_char(s[0]);
res = PyUnicode_New(size, 127); res = PyUnicode_New(size, 127);
if (!res) if (!res)
return NULL; return NULL;
@ -1653,6 +1655,8 @@ _PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
Py_ssize_t i; Py_ssize_t i;
assert(size >= 0); assert(size >= 0);
if (size == 1)
return get_latin1_char(u[0]);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (u[i] & 0x80) { if (u[i] & 0x80) {
max_char = 255; max_char = 255;
@ -1675,6 +1679,8 @@ _PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
Py_ssize_t i; Py_ssize_t i;
assert(size >= 0); assert(size >= 0);
if (size == 1 && u[0] < 256)
return get_latin1_char(u[0]);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (u[i] > max_char) { if (u[i] > max_char) {
max_char = u[i]; max_char = u[i];
@ -1702,6 +1708,8 @@ _PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
Py_ssize_t i; Py_ssize_t i;
assert(size >= 0); assert(size >= 0);
if (size == 1 && u[0] < 256)
return get_latin1_char(u[0]);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (u[i] > max_char) { if (u[i] > max_char) {
max_char = u[i]; max_char = u[i];