greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use unicode

Browse Source
This commit is contained in:
Neal Norwitz
2007-08-25 17:20:32 +00:00
parent 3ef6a57908
commit 392c5bed12
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/pyexpat.c
View File

@@ -146,7 +146,7 @@ get_handler_name(struct HandlerInfo *hinfo)
{ {
PyObject *name = hinfo->nameobj; PyObject *name = hinfo->nameobj;
if (name == NULL) { if (name == NULL) {
name = PyString_FromString(hinfo->name); name = PyUnicode_FromString(hinfo->name);
hinfo->nameobj = name; hinfo->nameobj = name;
} }
Py_XINCREF(name); Py_XINCREF(name);
@@ -1408,7 +1408,7 @@ xmlparse_dir(PyObject *self, PyObject* noargs)
{ {
#define APPEND(list, str) \ #define APPEND(list, str) \
do { \ do { \
PyObject *o = PyString_FromString(str); \ PyObject *o = PyUnicode_FromString(str); \
if (o != NULL) \ if (o != NULL) \
PyList_Append(list, o); \ PyList_Append(list, o); \
Py_XDECREF(o); \ Py_XDECREF(o); \
@@ -1706,7 +1706,7 @@ get_version_string(void)
while (rev[i] != ' ' && rev[i] != '\0') while (rev[i] != ' ' && rev[i] != '\0')
++i; ++i;
return PyString_FromStringAndSize(rev, i); return PyUnicode_FromStringAndSize(rev, i);
} }
/* Initialization function for the module */ /* Initialization function for the module */
@@ -1733,7 +1733,7 @@ PyMODINIT_FUNC
MODULE_INITFUNC(void) MODULE_INITFUNC(void)
{ {
PyObject *m, *d; PyObject *m, *d;
PyObject *errmod_name = PyString_FromString(MODULE_NAME ".errors"); PyObject *errmod_name = PyUnicode_FromString(MODULE_NAME ".errors");
PyObject *errors_module; PyObject *errors_module;
PyObject *modelmod_name; PyObject *modelmod_name;
PyObject *model_module; PyObject *model_module;
@@ -1743,7 +1743,7 @@ MODULE_INITFUNC(void)
if (errmod_name == NULL) if (errmod_name == NULL)
return; return;
modelmod_name = PyString_FromString(MODULE_NAME ".model"); modelmod_name = PyUnicode_FromString(MODULE_NAME ".model");
if (modelmod_name == NULL) if (modelmod_name == NULL)
return; return;