mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Use unicode

Browse source
This commit is contained in:
Neal Norwitz 2007-08-26 04:57:08 +00:00
parent 3fcbea567b
commit 8abd2e6c6e
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/ossaudiodev.c
View file

@ -366,10 +366,10 @@ oss_read(oss_audio_t *self, PyObject *args)
if (!PyArg_ParseTuple(args, "i:read", &size)) if (!PyArg_ParseTuple(args, "i:read", &size))
return NULL; return NULL;
rv = PyString_FromStringAndSize(NULL, size); rv = PyBytes_FromStringAndSize(NULL, size);
if (rv == NULL) if (rv == NULL)
return NULL; return NULL;
cp = PyString_AS_STRING(rv); cp = PyBytes_AS_STRING(rv);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
count = read(self->fd, cp, size); count = read(self->fd, cp, size);
@ -381,7 +381,7 @@ oss_read(oss_audio_t *self, PyObject *args)
return NULL; return NULL;
} }
self->icount += count; self->icount += count;
_PyString_Resize(&rv, count); PyBytes_Resize(rv, count);
return rv; return rv;
} }
@ -391,7 +391,7 @@ oss_write(oss_audio_t *self, PyObject *args)
char *cp; char *cp;
int rv, size; int rv, size;
if (!PyArg_ParseTuple(args, "s#:write", &cp, &size)) { if (!PyArg_ParseTuple(args, "y#:write", &cp, &size)) {
return NULL; return NULL;
} }
@ -422,7 +422,7 @@ oss_writeall(oss_audio_t *self, PyObject *args)
mode, the behaviour of write() and writeall() from Python is mode, the behaviour of write() and writeall() from Python is
indistinguishable. */ indistinguishable. */
if (!PyArg_ParseTuple(args, "s#:write", &cp, &size)) if (!PyArg_ParseTuple(args, "y#:write", &cp, &size))
return NULL; return NULL;
/* use select to wait for audio device to be available */ /* use select to wait for audio device to be available */
@ -811,20 +811,20 @@ oss_getattr(oss_audio_t *self, char *name)
Py_INCREF(rval); Py_INCREF(rval);
} }
else if (strcmp(name, "name") == 0) { else if (strcmp(name, "name") == 0) {
rval = PyString_FromString(self->devicename); rval = PyUnicode_FromString(self->devicename);
} }
else if (strcmp(name, "mode") == 0) { else if (strcmp(name, "mode") == 0) {
/* No need for a "default" in this switch: from newossobject(), /* No need for a "default" in this switch: from newossobject(),
self->mode can only be one of these three values. */ self->mode can only be one of these three values. */
switch(self->mode) { switch(self->mode) {
case O_RDONLY: case O_RDONLY:
rval = PyString_FromString("r"); rval = PyUnicode_FromString("r");
break; break;
case O_RDWR: case O_RDWR:
rval = PyString_FromString("rw"); rval = PyUnicode_FromString("rw");
break; break;
case O_WRONLY: case O_WRONLY:
rval = PyString_FromString("w"); rval = PyUnicode_FromString("w");
break; break;
} }
} }
@ -913,12 +913,12 @@ build_namelists (PyObject *module)
if (labels == NULL || names == NULL) if (labels == NULL || names == NULL)
goto error2; goto error2;
for (i = 0; i < num_controls; i++) { for (i = 0; i < num_controls; i++) {
s = PyString_FromString(control_labels[i]); s = PyUnicode_FromString(control_labels[i]);
if (s == NULL) if (s == NULL)
goto error2; goto error2;
PyList_SET_ITEM(labels, i, s); PyList_SET_ITEM(labels, i, s);
s = PyString_FromString(control_names[i]); s = PyUnicode_FromString(control_names[i]);
if (s == NULL) if (s == NULL)
goto error2; goto error2;
PyList_SET_ITEM(names, i, s); PyList_SET_ITEM(names, i, s);