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

Decode untyped strings from UTF-8.

This commit is contained in:
Martin v. Löwis 2002-12-04 19:54:36 +00:00
parent 7e5bf674b8
commit e07e18d41b
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Modules/_tkinter.c
View File

@ -770,8 +770,33 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
PyObject *result = NULL;
TkappObject *app = (TkappObject*)tkapp;
if (value->typePtr == NULL)
return PyString_FromStringAndSize(value->bytes, value->length);
if (value->typePtr == NULL) {
/* If the result contains any bytes with the top bit set,
it's UTF-8 and we should decode it to Unicode */
#ifdef Py_USING_UNICODE
int i;
char *s = value->bytes;
int len = value->length;
for (i = 0; i < len; i++) {
if (value->bytes[i] & 0x80)
break;
}
if (i == value->length)
result = PyString_FromStringAndSize(s, len);
else {
/* Convert UTF-8 to Unicode string */
result = PyUnicode_DecodeUTF8(s, len, "strict");
if (result == NULL) {
PyErr_Clear();
result = PyString_FromStringAndSize(s, len);
}
}
#else
res = PyString_FromStringAndSize(value->bytes, value->length);
#endif
return result;
}
if (value->typePtr == app->BooleanType) {
result = value->internalRep.longValue ? Py_True : Py_False;