mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
This commit is contained in:
parent
bd25030019
commit
f95a1b3c53
248 changed files with 113361 additions and 113361 deletions
|
@ -809,8 +809,8 @@ oss_getattro(oss_audio_t *self, PyObject *nameobj)
|
|||
PyObject * rval = NULL;
|
||||
|
||||
if (PyUnicode_Check(nameobj))
|
||||
name = _PyUnicode_AsString(nameobj);
|
||||
|
||||
name = _PyUnicode_AsString(nameobj);
|
||||
|
||||
if (strcmp(name, "closed") == 0) {
|
||||
rval = (self->fd == -1) ? Py_True : Py_False;
|
||||
Py_INCREF(rval);
|
||||
|
@ -975,15 +975,15 @@ error1:
|
|||
|
||||
|
||||
static struct PyModuleDef ossaudiodevmodule = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"ossaudiodev",
|
||||
NULL,
|
||||
-1,
|
||||
ossaudiodev_methods,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"ossaudiodev",
|
||||
NULL,
|
||||
-1,
|
||||
ossaudiodev_methods,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
PyMODINIT_FUNC
|
||||
|
@ -999,10 +999,10 @@ PyInit_ossaudiodev(void)
|
|||
|
||||
m = PyModule_Create(&ossaudiodevmodule);
|
||||
if (m == NULL)
|
||||
return NULL;
|
||||
return NULL;
|
||||
|
||||
OSSAudioError = PyErr_NewException("ossaudiodev.OSSAudioError",
|
||||
NULL, NULL);
|
||||
NULL, NULL);
|
||||
if (OSSAudioError) {
|
||||
/* Each call to PyModule_AddObject decrefs it; compensate: */
|
||||
Py_INCREF(OSSAudioError);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue