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/operator.c b/Modules/operator.c
index 7e44739..fd98efd 100644
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -508,19 +508,19 @@
}
#endif
- if (!PyBytes_Check(attr)) {
+ if (!PyString_Check(attr)) {
PyErr_SetString(PyExc_TypeError,
"attribute name must be a string");
return NULL;
}
- s = PyBytes_AS_STRING(attr);
+ s = PyString_AS_STRING(attr);
Py_INCREF(obj);
for (;;) {
PyObject *newobj, *str;
p = strchr(s, '.');
- str = p ? PyBytes_FromStringAndSize(s, (p-s)) :
- PyBytes_FromString(s);
+ str = p ? PyString_FromStringAndSize(s, (p-s)) :
+ PyString_FromString(s);
if (str == NULL) {
Py_DECREF(obj);
return NULL;