summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-25 17:20:32 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-25 17:20:32 (GMT)
commit392c5bed123a8cea62b621a84266214ca959fb31 (patch)
treef60bdc978ab35c84b0da64bbde8a05a0af279ad9
parent3ef6a57908ec5dca73351ab756d43e7b58b65609 (diff)
downloadcpython-392c5bed123a8cea62b621a84266214ca959fb31.zip
cpython-392c5bed123a8cea62b621a84266214ca959fb31.tar.gz
cpython-392c5bed123a8cea62b621a84266214ca959fb31.tar.bz2
Use unicode
-rw-r--r--Modules/pyexpat.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 02c5d40..6cfb8ec 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -146,7 +146,7 @@ get_handler_name(struct HandlerInfo *hinfo)
{
PyObject *name = hinfo->nameobj;
if (name == NULL) {
- name = PyString_FromString(hinfo->name);
+ name = PyUnicode_FromString(hinfo->name);
hinfo->nameobj = name;
}
Py_XINCREF(name);
@@ -1408,7 +1408,7 @@ xmlparse_dir(PyObject *self, PyObject* noargs)
{
#define APPEND(list, str) \
do { \
- PyObject *o = PyString_FromString(str); \
+ PyObject *o = PyUnicode_FromString(str); \
if (o != NULL) \
PyList_Append(list, o); \
Py_XDECREF(o); \
@@ -1706,7 +1706,7 @@ get_version_string(void)
while (rev[i] != ' ' && rev[i] != '\0')
++i;
- return PyString_FromStringAndSize(rev, i);
+ return PyUnicode_FromStringAndSize(rev, i);
}
/* Initialization function for the module */
@@ -1733,7 +1733,7 @@ PyMODINIT_FUNC
MODULE_INITFUNC(void)
{
PyObject *m, *d;
- PyObject *errmod_name = PyString_FromString(MODULE_NAME ".errors");
+ PyObject *errmod_name = PyUnicode_FromString(MODULE_NAME ".errors");
PyObject *errors_module;
PyObject *modelmod_name;
PyObject *model_module;
@@ -1743,7 +1743,7 @@ MODULE_INITFUNC(void)
if (errmod_name == NULL)
return;
- modelmod_name = PyString_FromString(MODULE_NAME ".model");
+ modelmod_name = PyUnicode_FromString(MODULE_NAME ".model");
if (modelmod_name == NULL)
return;