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/flmodule.c b/Modules/flmodule.c
index 800aebb..20e74e9 100644
--- a/Modules/flmodule.c
+++ b/Modules/flmodule.c
@@ -324,7 +324,7 @@
/* "label" is an exception, getmember only works for char pointers,
not for char arrays */
if (strcmp(name, "label") == 0)
- return PyBytes_FromString(g->ob_generic->label);
+ return PyString_FromString(g->ob_generic->label);
return PyMember_Get((char *)g->ob_generic, generic_memberlist, name);
}
@@ -343,12 +343,12 @@
/* "label" is an exception: setmember doesn't set strings;
and FORMS wants you to call a function to set the label */
if (strcmp(name, "label") == 0) {
- if (!PyBytes_Check(v)) {
+ if (!PyString_Check(v)) {
PyErr_SetString(PyExc_TypeError,
"label attr must be string");
return -1;
}
- fl_set_object_label(g->ob_generic, PyBytes_AsString(v));
+ fl_set_object_label(g->ob_generic, PyString_AsString(v));
return 0;
}
@@ -369,7 +369,7 @@
char buf[100];
PyOS_snprintf(buf, sizeof(buf), "<FORMS_object at %p, objclass=%d>",
g, g->ob_generic->objclass);
- return PyBytes_FromString(buf);
+ return PyString_FromString(buf);
}
static PyTypeObject GenericObjecttype = {
@@ -530,7 +530,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString (str);
+ return PyString_FromString (str);
}
/* int func (object) */
@@ -628,7 +628,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString (str);
+ return PyString_FromString (str);
}
static PyObject *
@@ -1594,7 +1594,7 @@
char buf[100];
PyOS_snprintf(buf, sizeof(buf), "<FORMS_form at %p, window=%ld>",
f, f->ob_form->window);
- return PyBytes_FromString(buf);
+ return PyString_FromString(buf);
}
static PyTypeObject Formtype = {
@@ -2027,7 +2027,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(str);
+ return PyString_FromString(str);
}
static PyObject *
@@ -2046,7 +2046,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(str);
+ return PyString_FromString(str);
}
@@ -2061,7 +2061,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(str);
+ return PyString_FromString(str);
}
static PyObject *