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/fmmodule.c b/Modules/fmmodule.c
index 73b8c05..f3f0dc5 100644
--- a/Modules/fmmodule.c
+++ b/Modules/fmmodule.c
@@ -66,7 +66,7 @@
PyErr_SetString(PyExc_RuntimeError, "error in fmgetfontname");
return NULL;
}
- return PyBytes_FromStringAndSize(fontname, len);
+ return PyString_FromStringAndSize(fontname, len);
}
static PyObject *
@@ -79,7 +79,7 @@
PyErr_SetString(PyExc_RuntimeError, "error in fmgetcomment");
return NULL;
}
- return PyBytes_FromStringAndSize(comment, len);
+ return PyString_FromStringAndSize(comment, len);
}
static PyObject *
@@ -200,7 +200,7 @@
PyObject *v;
if (fontlist == NULL)
return;
- v = PyBytes_FromString(fontname);
+ v = PyString_FromString(fontname);
if (v == NULL)
err = -1;
else {
@@ -240,7 +240,7 @@
static PyObject *
fm_fontpath(PyObject *self)
{
- return PyBytes_FromString(fmfontpath());
+ return PyString_FromString(fmfontpath());
}
static PyMethodDef fm_methods[] = {