Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change category(), bidirectional(), east_asian_width(),

Browse source 
decomposition() and name() to return unicode strings.
This commit is contained in:
Walter Dörwald 2007-06-05 16:04:09 +00:00
parent 0bbd8abe6b
commit 4254e76319
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/unicodedata.c
View file

@ -258,7 +258,7 @@ unicodedata_category(PyObject *self, PyObject *args)
if (old->category_changed != 0xFF)
index = old->category_changed;
}
return PyString_FromString(_PyUnicode_CategoryNames[index]);
return PyUnicode_FromString(_PyUnicode_CategoryNames[index]);
}
PyDoc_STRVAR(unicodedata_bidirectional__doc__,
@ -290,7 +290,7 @@ unicodedata_bidirectional(PyObject *self, PyObject *args)
else if (old->bidir_changed != 0xFF)
index = old->bidir_changed;
}
return PyString_FromString(_PyUnicode_BidirectionalNames[index]);
return PyUnicode_FromString(_PyUnicode_BidirectionalNames[index]);
}
PyDoc_STRVAR(unicodedata_combining__doc__,
@ -379,7 +379,7 @@ unicodedata_east_asian_width(PyObject *self, PyObject *args)
if (old->category_changed == 0)
index = 0; /* unassigned */
}
return PyString_FromString(_PyUnicode_EastAsianWidthNames[index]);
return PyUnicode_FromString(_PyUnicode_EastAsianWidthNames[index]);
}
PyDoc_STRVAR(unicodedata_decomposition__doc__,
@ -411,7 +411,7 @@ unicodedata_decomposition(PyObject *self, PyObject *args)
if (self) {
const change_record *old = get_old_record(self, *PyUnicode_AS_UNICODE(v));
if (old->category_changed == 0)
return PyString_FromString(""); /* unassigned */
return PyUnicode_FromString(""); /* unassigned */
}
if (code < 0 || code >= 0x110000)
@ -450,7 +450,7 @@ unicodedata_decomposition(PyObject *self, PyObject *args)
decomp[i] = '\0';
return PyString_FromString(decomp);
return PyUnicode_FromString(decomp);
}
static void
@ -1063,7 +1063,7 @@ unicodedata_name(PyObject* self, PyObject* args)
}
}
return Py_BuildValue("s", name);
return PyUnicode_FromString(name);
}
PyDoc_STRVAR(unicodedata_lookup__doc__,