traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-34740: Get rid of tp_getattro in ossaudiodev.oss_audio_device. (GH-9421) 

Use tp_members and tp_getset instead.
This commit is contained in:
Serhiy Storchaka 2018-10-04 10:42:06 +03:00 committed by GitHub
parent b2953fa3dd
commit 5f5a7781c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Modules/ossaudiodev.c
View File

@ -921,45 +921,42 @@ static PyMethodDef oss_mixer_methods[] = {
{ NULL, NULL}
};
static PyMemberDef oss_members[] = {
{"name", T_STRING, offsetof(oss_audio_t, devicename), READONLY, NULL},
{NULL}
};
static PyObject *
oss_getattro(oss_audio_t *self, PyObject *nameobj)
oss_closed_getter(oss_audio_t *self, void *closure)
{
const char *name = "";
PyObject * rval = NULL;
if (PyUnicode_Check(nameobj)) {
name = PyUnicode_AsUTF8(nameobj);
if (name == NULL)
return NULL;
return PyBool_FromLong(self->fd == -1);
}
if (strcmp(name, "closed") == 0) {
rval = (self->fd == -1) ? Py_True : Py_False;
Py_INCREF(rval);
}
else if (strcmp(name, "name") == 0) {
rval = PyUnicode_FromString(self->devicename);
}
else if (strcmp(name, "mode") == 0) {
/* No need for a "default" in this switch: from newossobject(),
self->mode can only be one of these three values. */
static PyObject *
oss_mode_getter(oss_audio_t *self, void *closure)
{
switch(self->mode) {
case O_RDONLY:
rval = PyUnicode_FromString("r");
return PyUnicode_FromString("r");
break;
case O_RDWR:
rval = PyUnicode_FromString("rw");
return PyUnicode_FromString("rw");
break;
case O_WRONLY:
rval = PyUnicode_FromString("w");
return PyUnicode_FromString("w");
break;
default:
/* From newossobject(), self->mode can only be one
of these three values. */
Py_UNREACHABLE();
}
}
else {
rval = PyObject_GenericGetAttr((PyObject *)self, nameobj);
}
return rval;
}
static PyGetSetDef oss_getsetlist[] = {
{"closed", (getter)oss_closed_getter, (setter)NULL, NULL},
{"mode", (getter)oss_mode_getter, (setter)NULL, NULL},
{NULL},
};
static PyTypeObject OSSAudioType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
@ -979,7 +976,7 @@ static PyTypeObject OSSAudioType = {
0, /*tp_hash*/
0, /*tp_call*/
0, /*tp_str*/
(getattrofunc)oss_getattro, /*tp_getattro*/
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT, /*tp_flags*/
@ -991,6 +988,8 @@ static PyTypeObject OSSAudioType = {
0, /*tp_iter*/
0, /*tp_iternext*/
oss_methods, /*tp_methods*/
oss_members, /*tp_members*/
oss_getsetlist, /*tp_getset*/
};
static PyTypeObject OSSMixerType = {