This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index 8dd1d96..0811430 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -115,8 +115,8 @@
if (invallen > 0 && inval[invallen-1] == '\0')
invallen--;
}
- key = PyBytes_FromStringAndSize(inkey, inkeylen);
- val = PyBytes_FromStringAndSize(inval, invallen);
+ key = PyString_FromStringAndSize(inkey, inkeylen);
+ val = PyString_FromStringAndSize(inval, invallen);
if (key == NULL || val == NULL) {
/* XXX error -- don't know how to handle */
PyErr_Clear();
@@ -146,7 +146,7 @@
if ((err = yp_get_default_domain(&domain)) != 0)
return nis_error(err);
- res = PyBytes_FromStringAndSize (domain, strlen(domain));
+ res = PyString_FromStringAndSize (domain, strlen(domain));
return res;
}
@@ -178,7 +178,7 @@
len--;
if (err != 0)
return nis_error(err);
- res = PyBytes_FromStringAndSize (match, len);
+ res = PyString_FromStringAndSize (match, len);
free (match);
return res;
}
@@ -398,7 +398,7 @@
if ((list = PyList_New(0)) == NULL)
return NULL;
for (maps = maps; maps; maps = maps->next) {
- PyObject *str = PyBytes_FromString(maps->map);
+ PyObject *str = PyString_FromString(maps->map);
if (!str || PyList_Append(list, str) < 0)
{
Py_DECREF(list);