[Python-3000-checkins] r59108 - python/branches/py3k/Modules/audioop.c
amaury.forgeotdarc
python-3000-checkins at python.org
Thu Nov 22 02:09:33 CET 2007
Author: amaury.forgeotdarc
Date: Thu Nov 22 02:09:33 2007
New Revision: 59108
Modified:
python/branches/py3k/Modules/audioop.c
Log:
In audioop, return PyString instead of PyBytes.
Modified: python/branches/py3k/Modules/audioop.c
==============================================================================
--- python/branches/py3k/Modules/audioop.c (original)
+++ python/branches/py3k/Modules/audioop.c Thu Nov 22 02:09:33 2007
@@ -759,10 +759,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len);
+ rv = PyString_FromStringAndSize(NULL, len);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len; i += size ) {
@@ -801,10 +801,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len/2);
+ rv = PyString_FromStringAndSize(NULL, len/2);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len; i += size*2 ) {
@@ -846,10 +846,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len*2);
+ rv = PyString_FromStringAndSize(NULL, len*2);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len; i += size ) {
@@ -903,10 +903,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len1);
+ rv = PyString_FromStringAndSize(NULL, len1);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len1; i += size ) {
if ( size == 1 ) val1 = (int)*CHARP(cp1, i);
@@ -949,10 +949,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len);
+ rv = PyString_FromStringAndSize(NULL, len);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len; i += size ) {
@@ -985,10 +985,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len);
+ rv = PyString_FromStringAndSize(NULL, len);
if ( rv == 0 )
return 0;
- ncp = (unsigned char *)PyBytes_AsString(rv);
+ ncp = (unsigned char *)PyString_AsString(rv);
for ( i=0; i < len; i += size ) {
if ( size == 1 ) val = ((int)*CHARP(cp, i)) << 8;
@@ -1023,10 +1023,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, (len/size)*size2);
+ rv = PyString_FromStringAndSize(NULL, (len/size)*size2);
if ( rv == 0 )
return 0;
- ncp = (unsigned char *)PyBytes_AsString(rv);
+ ncp = (unsigned char *)PyString_AsString(rv);
for ( i=0, j=0; i < len; i += size, j += size2 ) {
if ( size == 1 ) val = ((int)*CHARP(cp, i)) << 8;
@@ -1157,7 +1157,7 @@
nbytes / bytes_per_frame != ceiling)
str = NULL;
else
- str = PyBytes_FromStringAndSize(NULL, nbytes);
+ str = PyString_FromStringAndSize(NULL, nbytes);
if (str == NULL) {
PyErr_SetString(PyExc_MemoryError,
@@ -1165,7 +1165,7 @@
goto exit;
}
}
- ncp = PyBytes_AsString(str);
+ ncp = PyString_AsString(str);
for (;;) {
while (d < 0) {
@@ -1182,9 +1182,9 @@
goto exit;
/* We have checked before that the length
* of the string fits into int. */
- len = (int)(ncp - PyBytes_AsString(str));
- rv = PyBytes_FromStringAndSize
- (PyBytes_AsString(str), len);
+ len = (int)(ncp - PyString_AsString(str));
+ rv = PyString_FromStringAndSize
+ (PyString_AsString(str), len);
Py_DECREF(str);
str = rv;
if (str == NULL)
@@ -1254,10 +1254,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len/size);
+ rv = PyString_FromStringAndSize(NULL, len/size);
if ( rv == 0 )
return 0;
- ncp = (unsigned char *)PyBytes_AsString(rv);
+ ncp = (unsigned char *)PyString_AsString(rv);
for ( i=0; i < len; i += size ) {
if ( size == 1 ) val = ((int)*CHARP(cp, i)) << 8;
@@ -1288,10 +1288,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len*size);
+ rv = PyString_FromStringAndSize(NULL, len*size);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len*size; i += size ) {
cval = *cp++;
@@ -1322,10 +1322,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len/size);
+ rv = PyString_FromStringAndSize(NULL, len/size);
if ( rv == 0 )
return 0;
- ncp = (unsigned char *)PyBytes_AsString(rv);
+ ncp = (unsigned char *)PyString_AsString(rv);
for ( i=0; i < len; i += size ) {
if ( size == 1 ) val = ((int)*CHARP(cp, i)) << 8;
@@ -1356,10 +1356,10 @@
return 0;
}
- rv = PyBytes_FromStringAndSize(NULL, len*size);
+ rv = PyString_FromStringAndSize(NULL, len*size);
if ( rv == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(rv);
+ ncp = (signed char *)PyString_AsString(rv);
for ( i=0; i < len*size; i += size ) {
cval = *cp++;
@@ -1392,10 +1392,10 @@
return 0;
}
- str = PyBytes_FromStringAndSize(NULL, len/(size*2));
+ str = PyString_FromStringAndSize(NULL, len/(size*2));
if ( str == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(str);
+ ncp = (signed char *)PyString_AsString(str);
/* Decode state, should have (value, step) */
if ( state == Py_None ) {
@@ -1508,10 +1508,10 @@
} else if ( !PyArg_ParseTuple(state, "ii", &valpred, &index) )
return 0;
- str = PyBytes_FromStringAndSize(NULL, len*size*2);
+ str = PyString_FromStringAndSize(NULL, len*size*2);
if ( str == 0 )
return 0;
- ncp = (signed char *)PyBytes_AsString(str);
+ ncp = (signed char *)PyString_AsString(str);
step = stepsizeTable[index];
bufferstep = 0;
More information about the Python-3000-checkins
mailing list