diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Modules/fmmodule.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.zip cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.bz2 | |
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.
Diffstat (limited to 'Modules/fmmodule.c')
| -rw-r--r-- | Modules/fmmodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ fh_getfontname(fhobject *self) 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 @@ fh_getcomment(fhobject *self) 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 @@ clientproc(char *fontname) PyObject *v; if (fontlist == NULL) return; - v = PyBytes_FromString(fontname); + v = PyString_FromString(fontname); if (v == NULL) err = -1; else { @@ -240,7 +240,7 @@ fm_setpath(PyObject *self, PyObject *args) static PyObject * fm_fontpath(PyObject *self) { - return PyBytes_FromString(fmfontpath()); + return PyString_FromString(fmfontpath()); } static PyMethodDef fm_methods[] = { |