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/stropmodule.c b/Modules/stropmodule.c
index e0e5ad0..8b00fed 100644
--- a/Modules/stropmodule.c
+++ b/Modules/stropmodule.c
@@ -47,7 +47,7 @@
i = i+1;
}
if (j < i) {
- item = PyBytes_FromStringAndSize(s+j, i-j);
+ item = PyString_FromStringAndSize(s+j, i-j);
if (item == NULL)
goto finally;
@@ -61,7 +61,7 @@
i = i+1;
}
if (maxsplit && (countsplit >= maxsplit) && i < len) {
- item = PyBytes_FromStringAndSize(
+ item = PyString_FromStringAndSize(
s+i, len - i);
if (item == NULL)
goto finally;
@@ -122,7 +122,7 @@
i = j = 0;
while (i+n <= len) {
if (s[i] == sub[0] && (n == 1 || memcmp(s+i, sub, n) == 0)) {
- item = PyBytes_FromStringAndSize(s+j, i-j);
+ item = PyString_FromStringAndSize(s+j, i-j);
if (item == NULL)
goto fail;
err = PyList_Append(list, item);
@@ -137,7 +137,7 @@
else
i++;
}
- item = PyBytes_FromStringAndSize(s+j, len-j);
+ item = PyString_FromStringAndSize(s+j, len-j);
if (item == NULL)
goto fail;
err = PyList_Append(list, item);
@@ -189,7 +189,7 @@
if (seqlen == 1) {
/* Optimization if there's only one item */
PyObject *item = PySequence_GetItem(seq, 0);
- if (item && !PyBytes_Check(item)) {
+ if (item && !PyString_Check(item)) {
PyErr_SetString(PyExc_TypeError,
"first argument must be sequence of strings");
Py_DECREF(item);
@@ -198,9 +198,9 @@
return item;
}
- if (!(res = PyBytes_FromStringAndSize((char*)NULL, sz)))
+ if (!(res = PyString_FromStringAndSize((char*)NULL, sz)))
return NULL;
- p = PyBytes_AsString(res);
+ p = PyString_AsString(res);
/* optimize for lists, since it's the most common case. all others
* (tuples and arbitrary sequences) just use the sequence abstract
@@ -209,29 +209,29 @@
if (PyList_Check(seq)) {
for (i = 0; i < seqlen; i++) {
PyObject *item = PyList_GET_ITEM(seq, i);
- if (!PyBytes_Check(item)) {
+ if (!PyString_Check(item)) {
PyErr_SetString(PyExc_TypeError,
"first argument must be sequence of strings");
Py_DECREF(res);
return NULL;
}
- slen = PyBytes_GET_SIZE(item);
+ slen = PyString_GET_SIZE(item);
while (reslen + slen + seplen >= sz) {
- if (_PyBytes_Resize(&res, sz * 2) < 0)
+ if (_PyString_Resize(&res, sz * 2) < 0)
return NULL;
sz *= 2;
- p = PyBytes_AsString(res) + reslen;
+ p = PyString_AsString(res) + reslen;
}
if (i > 0) {
memcpy(p, sep, seplen);
p += seplen;
reslen += seplen;
}
- memcpy(p, PyBytes_AS_STRING(item), slen);
+ memcpy(p, PyString_AS_STRING(item), slen);
p += slen;
reslen += slen;
}
- _PyBytes_Resize(&res, reslen);
+ _PyString_Resize(&res, reslen);
return res;
}
@@ -245,33 +245,33 @@
/* This is now type safe */
for (i = 0; i < seqlen; i++) {
PyObject *item = getitemfunc(seq, i);
- if (!item || !PyBytes_Check(item)) {
+ if (!item || !PyString_Check(item)) {
PyErr_SetString(PyExc_TypeError,
"first argument must be sequence of strings");
Py_DECREF(res);
Py_XDECREF(item);
return NULL;
}
- slen = PyBytes_GET_SIZE(item);
+ slen = PyString_GET_SIZE(item);
while (reslen + slen + seplen >= sz) {
- if (_PyBytes_Resize(&res, sz * 2) < 0) {
+ if (_PyString_Resize(&res, sz * 2) < 0) {
Py_DECREF(item);
return NULL;
}
sz *= 2;
- p = PyBytes_AsString(res) + reslen;
+ p = PyString_AsString(res) + reslen;
}
if (i > 0) {
memcpy(p, sep, seplen);
p += seplen;
reslen += seplen;
}
- memcpy(p, PyBytes_AS_STRING(item), slen);
+ memcpy(p, PyString_AS_STRING(item), slen);
p += slen;
reslen += slen;
Py_DECREF(item);
}
- _PyBytes_Resize(&res, reslen);
+ _PyString_Resize(&res, reslen);
return res;
}
@@ -369,7 +369,7 @@
Py_ssize_t len, i, j;
- if (PyBytes_AsStringAndSize(args, &s, &len))
+ if (PyString_AsStringAndSize(args, &s, &len))
return NULL;
i = 0;
@@ -392,7 +392,7 @@
return args;
}
else
- return PyBytes_FromStringAndSize(s+i, j-i);
+ return PyString_FromStringAndSize(s+i, j-i);
}
@@ -450,12 +450,12 @@
int changed;
WARN;
- if (PyBytes_AsStringAndSize(args, &s, &n))
+ if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
- newstr = PyBytes_FromStringAndSize(NULL, n);
+ newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
- s_new = PyBytes_AsString(newstr);
+ s_new = PyString_AsString(newstr);
changed = 0;
for (i = 0; i < n; i++) {
int c = Py_CHARMASK(*s++);
@@ -489,12 +489,12 @@
int changed;
WARN;
- if (PyBytes_AsStringAndSize(args, &s, &n))
+ if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
- newstr = PyBytes_FromStringAndSize(NULL, n);
+ newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
- s_new = PyBytes_AsString(newstr);
+ s_new = PyString_AsString(newstr);
changed = 0;
for (i = 0; i < n; i++) {
int c = Py_CHARMASK(*s++);
@@ -529,12 +529,12 @@
int changed;
WARN;
- if (PyBytes_AsStringAndSize(args, &s, &n))
+ if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
- newstr = PyBytes_FromStringAndSize(NULL, n);
+ newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
- s_new = PyBytes_AsString(newstr);
+ s_new = PyString_AsString(newstr);
changed = 0;
if (0 < n) {
int c = Py_CHARMASK(*s++);
@@ -610,12 +610,12 @@
}
/* Second pass: create output string and fill it */
- out = PyBytes_FromStringAndSize(NULL, i+j);
+ out = PyString_FromStringAndSize(NULL, i+j);
if (out == NULL)
return NULL;
i = 0;
- q = PyBytes_AS_STRING(out);
+ q = PyString_AS_STRING(out);
for (p = string; p < e; p++) {
if (*p == '\t') {
@@ -695,12 +695,12 @@
int changed;
WARN;
- if (PyBytes_AsStringAndSize(args, &s, &n))
+ if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
- newstr = PyBytes_FromStringAndSize(NULL, n);
+ newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
- s_new = PyBytes_AsString(newstr);
+ s_new = PyString_AsString(newstr);
changed = 0;
for (i = 0; i < n; i++) {
int c = Py_CHARMASK(*s++);
@@ -898,10 +898,10 @@
return NULL;
}
- result = PyBytes_FromStringAndSize((char *)NULL, 256);
+ result = PyString_FromStringAndSize((char *)NULL, 256);
if (result == NULL)
return NULL;
- c = (unsigned char *) PyBytes_AS_STRING((PyBytesObject *)result);
+ c = (unsigned char *) PyString_AS_STRING((PyStringObject *)result);
for (i = 0; i < 256; i++)
c[i]=(unsigned char)i;
for (i = 0; i < fromlen; i++)
@@ -942,12 +942,12 @@
}
table = table1;
- inlen = PyBytes_GET_SIZE(input_obj);
- result = PyBytes_FromStringAndSize((char *)NULL, inlen);
+ inlen = PyString_GET_SIZE(input_obj);
+ result = PyString_FromStringAndSize((char *)NULL, inlen);
if (result == NULL)
return NULL;
- output_start = output = PyBytes_AsString(result);
- input = PyBytes_AsString(input_obj);
+ output_start = output = PyString_AsString(result);
+ input = PyString_AsString(input_obj);
if (dellen == 0) {
/* If no deletions are required, use faster code */
@@ -983,7 +983,7 @@
}
/* Fix the size of the resulting string */
if (inlen > 0)
- _PyBytes_Resize(&result, output - output_start);
+ _PyString_Resize(&result, output - output_start);
return result;
}
@@ -1169,7 +1169,7 @@
Py_XINCREF(newstr);
}
else {
- newstr = PyBytes_FromStringAndSize(new_s, out_len);
+ newstr = PyString_FromStringAndSize(new_s, out_len);
PyMem_FREE(new_s);
}
return newstr;
@@ -1222,7 +1222,7 @@
if (isspace(c))
buf[n++] = c;
}
- s = PyBytes_FromStringAndSize(buf, n);
+ s = PyString_FromStringAndSize(buf, n);
if (s)
PyModule_AddObject(m, "whitespace", s);
@@ -1232,7 +1232,7 @@
if (islower(c))
buf[n++] = c;
}
- s = PyBytes_FromStringAndSize(buf, n);
+ s = PyString_FromStringAndSize(buf, n);
if (s)
PyModule_AddObject(m, "lowercase", s);
@@ -1242,7 +1242,7 @@
if (isupper(c))
buf[n++] = c;
}
- s = PyBytes_FromStringAndSize(buf, n);
+ s = PyString_FromStringAndSize(buf, n);
if (s)
PyModule_AddObject(m, "uppercase", s);
}