SF #818006: revert addition of 'closed', 'mode', and 'name' attributes

to oss_audio_device objects.

diff --git a/Doc/lib/libossaudiodev.tex b/Doc/lib/libossaudiodev.tex
index 762acb766dae139e097fb48dc0c3a1d448fd973f..8c8e445bb26b49bd4272c71a667b773017ae79b3 100644 (file)
--- a/Doc/lib/libossaudiodev.tex
+++ b/Doc/lib/libossaudiodev.tex
@@ -115,7 +115,7 @@ three audio parameters at once.  This is more convenient, but may not be
 as flexible in all cases.
 
 The audio device objects returned by \function{open()} define the
-following methods and (read-only) attributes:
+following methods:
 
 \begin{methoddesc}[audio device]{close}{}
 Explicitly close the audio device.  When you are done writing to or
@@ -289,21 +289,6 @@ Returns the number of samples that could be queued into the hardware
 buffer to be played without blocking.
 \end{methoddesc}
 
-Audio device objects also support several read-only attributes:
-
-\begin{memberdesc}[audio device]{closed}{}
-Boolean indicating whether the device has been closed.
-\end{memberdesc}
-
-\begin{memberdesc}[audio device]{name}{}
-String containing the name of the device file.
-\end{memberdesc}
-
-\begin{memberdesc}[audio device]{mode}{}
-The I/O mode for the file, either \code{"r"}, \code{"rw"}, or \code{"w"}.
-\end{memberdesc}
-
-
 \subsection{Mixer Device Objects \label{mixer-device-objects}}
 
 The mixer object provides two file-like methods:

diff --git a/Lib/test/test_ossaudiodev.py b/Lib/test/test_ossaudiodev.py
index f668eb41d7ed07a5c641095e8071c87240e43125..89849e9d402a40b815f2b07eed9652c64cc16b9d 100644 (file)
--- a/Lib/test/test_ossaudiodev.py
+++ b/Lib/test/test_ossaudiodev.py
@@ -56,19 +56,6 @@ def play_sound_file(data, rate, ssize, nchannels):
     dsp.getptr()
     dsp.fileno()
 
-    # Make sure the read-only attributes work.
-    assert dsp.closed is False, "dsp.closed is not False"
-    assert dsp.name == "/dev/dsp"
-    assert dsp.mode == 'w', "bad dsp.mode: %r" % dsp.mode
-
-    # And make sure they're really read-only.
-    for attr in ('closed', 'name', 'mode'):
-        try:
-            setattr(dsp, attr, 42)
-            raise RuntimeError("dsp.%s not read-only" % attr)
-        except TypeError:
-            pass
-
     # set parameters based on .au file headers
     dsp.setparameters(AFMT_S16_NE, nchannels, rate)
     t1 = time.time()
@@ -145,6 +132,5 @@ def test():
         #test_bad_setparameters(dsp)
     finally:
         dsp.close()
-        assert dsp.closed is True, "dsp.closed is not True"
 
 test()

diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index 43bd92b53be0b430d4a4954f2450a9a7fbd9115c..047355fb784d5c724c5cf0afa658871b95832d00 100644 (file)
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -46,12 +46,11 @@ typedef unsigned long uint32_t;
 
 typedef struct {
     PyObject_HEAD;
-    char    *devicename;              /* name of the device file */
-    int      fd;                      /* file descriptor */
-    int      mode;                    /* file mode (O_RDONLY, etc.) */
-    int      icount;                  /* input count */
-    int      ocount;                  /* output count */
-    uint32_t afmts;                   /* audio formats supported by hardware */
+    int      fd;                      /* The open file */
+    int      mode;                    /* file mode */
+    int      icount;                  /* Input count */
+    int      ocount;                  /* Output count */
+    uint32_t afmts;                   /* Audio formats supported by hardware */
 } oss_audio_t;
 
 typedef struct {
@@ -75,7 +74,7 @@ newossobject(PyObject *arg)
 {
     oss_audio_t *self;
     int fd, afmts, imode;
-    char *devicename = NULL;
+    char *basedev = NULL;
     char *mode = NULL;
 
     /* Two ways to call open():
@@ -83,11 +82,11 @@ newossobject(PyObject *arg)
          open(mode)         (for backwards compatibility)
        because the *first* argument is optional, parsing args is
        a wee bit tricky. */
-    if (!PyArg_ParseTuple(arg, "s|s:open", &devicename, &mode))
+    if (!PyArg_ParseTuple(arg, "s|s:open", &basedev, &mode))
        return NULL;
     if (mode == NULL) {                 /* only one arg supplied */
-       mode = devicename;
-       devicename = NULL;
+       mode = basedev;
+       basedev = NULL;
     }
 
     if (strcmp(mode, "r") == 0)
@@ -103,18 +102,18 @@ newossobject(PyObject *arg)
 
     /* Open the correct device: either the 'device' argument,
        or the AUDIODEV environment variable, or "/dev/dsp". */
-    if (devicename == NULL) {              /* called with one arg */
-       devicename = getenv("AUDIODEV");
-       if (devicename == NULL)             /* $AUDIODEV not set */
-          devicename = "/dev/dsp";
+    if (basedev == NULL) {              /* called with one arg */
+       basedev = getenv("AUDIODEV");
+       if (basedev == NULL)             /* $AUDIODEV not set */
+          basedev = "/dev/dsp";
     }
 
     /* Open with O_NONBLOCK to avoid hanging on devices that only allow
        one open at a time.  This does *not* affect later I/O; OSS
        provides a special ioctl() for non-blocking read/write, which is
        exposed via oss_nonblock() below. */
-    if ((fd = open(devicename, imode|O_NONBLOCK)) == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_IOError, devicename);
+    if ((fd = open(basedev, imode|O_NONBLOCK)) == -1) {
+        PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
         return NULL;
     }
 
@@ -122,12 +121,12 @@ newossobject(PyObject *arg)
        expected write() semantics. */
     if (fcntl(fd, F_SETFL, 0) == -1) {
         close(fd);
-        PyErr_SetFromErrnoWithFilename(PyExc_IOError, devicename);
+        PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
         return NULL;
     }
 
     if (ioctl(fd, SNDCTL_DSP_GETFMTS, &afmts) == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_IOError, devicename);
+        PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
         return NULL;
     }
     /* Create and initialize the object */
@@ -135,7 +134,6 @@ newossobject(PyObject *arg)
         close(fd);
         return NULL;
     }
-    self->devicename = devicename;
     self->fd = fd;
     self->mode = imode;
     self->icount = self->ocount = 0;
@@ -160,22 +158,22 @@ oss_dealloc(oss_audio_t *self)
 static oss_mixer_t *
 newossmixerobject(PyObject *arg)
 {
-    char *devicename = NULL;
+    char *basedev = NULL;
     int fd;
     oss_mixer_t *self;
 
-    if (!PyArg_ParseTuple(arg, "|s", &devicename)) {
+    if (!PyArg_ParseTuple(arg, "|s", &basedev)) {
         return NULL;
     }
 
-    if (devicename == NULL) {
-        devicename = getenv("MIXERDEV");
-        if (devicename == NULL)            /* MIXERDEV not set */
-            devicename = "/dev/mixer";
+    if (basedev == NULL) {
+        basedev = getenv("MIXERDEV");
+        if (basedev == NULL)            /* MIXERDEV not set */
+            basedev = "/dev/mixer";
     }
 
-    if ((fd = open(devicename, O_RDWR)) == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_IOError, devicename);
+    if ((fd = open(basedev, O_RDWR)) == -1) {
+        PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
         return NULL;
     }
 
@@ -829,33 +827,7 @@ static PyMethodDef oss_mixer_methods[] = {
 static PyObject *
 oss_getattr(oss_audio_t *self, char *name)
 {
-    PyObject * rval = NULL;
-    if (strcmp(name, "closed") == 0) {
-        rval = (self->fd == -1) ? Py_True : Py_False;
-        Py_INCREF(rval);
-    }
-    else if (strcmp(name, "name") == 0) {
-        rval = PyString_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. */
-        switch(self->mode) {
-            case O_RDONLY:
-                rval = PyString_FromString("r");
-                break;
-            case O_RDWR:
-                rval = PyString_FromString("rw");
-                break;
-            case O_WRONLY:
-                rval = PyString_FromString("w");
-                break;
-        }
-    }
-    else {
-        rval = Py_FindMethod(oss_methods, (PyObject *)self, name);
-    }
-    return rval;
+    return Py_FindMethod(oss_methods, (PyObject *)self, name);
 }
 
 static PyObject *