traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use unicode (hope it's right, I can't test it)

This commit is contained in:
Neal Norwitz 2007-08-26 21:43:00 +00:00
parent e760631421
commit efaf629026
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/nismodule.c
View File

@ -115,8 +115,8 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
if (invallen > 0 && inval[invallen-1] == '\0') if (invallen > 0 && inval[invallen-1] == '\0')
invallen--; invallen--;
} }
key = PyString_FromStringAndSize(inkey, inkeylen); key = PyUnicode_FromStringAndSize(inkey, inkeylen);
val = PyString_FromStringAndSize(inval, invallen); val = PyUnicode_FromStringAndSize(inval, invallen);
if (key == NULL || val == NULL) { if (key == NULL || val == NULL) {
/* XXX error -- don't know how to handle */ /* XXX error -- don't know how to handle */
PyErr_Clear(); PyErr_Clear();
@ -146,7 +146,7 @@ nis_get_default_domain (PyObject *self)
if ((err = yp_get_default_domain(&domain)) != 0) if ((err = yp_get_default_domain(&domain)) != 0)
return nis_error(err); return nis_error(err);
res = PyString_FromStringAndSize (domain, strlen(domain)); res = PyUnicode_FromStringAndSize (domain, strlen(domain));
return res; return res;
} }
@ -178,7 +178,7 @@ nis_match (PyObject *self, PyObject *args, PyObject *kwdict)
len--; len--;
if (err != 0) if (err != 0)
return nis_error(err); return nis_error(err);
res = PyString_FromStringAndSize (match, len); res = PyUnicode_FromStringAndSize (match, len);
free (match); free (match);
return res; return res;
} }
@ -398,7 +398,7 @@ nis_maps (PyObject *self, PyObject *args, PyObject *kwdict)
if ((list = PyList_New(0)) == NULL) if ((list = PyList_New(0)) == NULL)
return NULL; return NULL;
for (maps = maps; maps; maps = maps->next) { 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) if (!str || PyList_Append(list, str) < 0)
{ {
Py_DECREF(list); Py_DECREF(list);