summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-26 21:43:00 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-26 21:43:00 (GMT)
commitefaf6290269263f2de218d47643fa34bf7c9333c (patch)
treee2704bc569caa535a3a65fbaee1cf34c3a6017b2 /Modules
parente760631421690e09d72847c61a1d2fce539baca8 (diff)
downloadcpython-efaf6290269263f2de218d47643fa34bf7c9333c.zip
cpython-efaf6290269263f2de218d47643fa34bf7c9333c.tar.gz
cpython-efaf6290269263f2de218d47643fa34bf7c9333c.tar.bz2
Use unicode (hope it's right, I can't test it)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/nismodule.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index 0811430..859042f 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -115,8 +115,8 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
if (invallen > 0 && inval[invallen-1] == '\0')
invallen--;
}
- key = PyString_FromStringAndSize(inkey, inkeylen);
- val = PyString_FromStringAndSize(inval, invallen);
+ key = PyUnicode_FromStringAndSize(inkey, inkeylen);
+ val = PyUnicode_FromStringAndSize(inval, invallen);
if (key == NULL || val == NULL) {
/* XXX error -- don't know how to handle */
PyErr_Clear();
@@ -146,7 +146,7 @@ nis_get_default_domain (PyObject *self)
if ((err = yp_get_default_domain(&domain)) != 0)
return nis_error(err);
- res = PyString_FromStringAndSize (domain, strlen(domain));
+ res = PyUnicode_FromStringAndSize (domain, strlen(domain));
return res;
}
@@ -178,7 +178,7 @@ nis_match (PyObject *self, PyObject *args, PyObject *kwdict)
len--;
if (err != 0)
return nis_error(err);
- res = PyString_FromStringAndSize (match, len);
+ res = PyUnicode_FromStringAndSize (match, len);
free (match);
return res;
}
@@ -398,7 +398,7 @@ nis_maps (PyObject *self, PyObject *args, PyObject *kwdict)
if ((list = PyList_New(0)) == NULL)
return NULL;
for (maps = maps; maps; maps = maps->next) {
- PyObject *str = PyString_FromString(maps->map);
+ PyObject *str = PyUnicode_FromString(maps->map);
if (!str || PyList_Append(list, str) < 0)
{
Py_DECREF(list);