[Python-checkins] r63021 - in python/trunk: Doc/library/undoc.rst Lib/test/test_linuxaudiodev.py Lib/test/test_py3kwarn.py Misc/NEWS Modules/linuxaudiodev.c

[brett.cannon]

Author: brett.cannon
Date: Sun May 11 02:50:51 2008
New Revision: 63021

Log:
The linuxaudidev module has been deprecated for removal in Python 3.0.

Modified:
   python/trunk/Doc/library/undoc.rst
   python/trunk/Lib/test/test_linuxaudiodev.py
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Misc/NEWS
   python/trunk/Modules/linuxaudiodev.c

Modified: python/trunk/Doc/library/undoc.rst
==============================================================================
--- python/trunk/Doc/library/undoc.rst	(original)
+++ python/trunk/Doc/library/undoc.rst	Sun May 11 02:50:51 2008
@@ -54,6 +54,8 @@
 :mod:`linuxaudiodev`
    --- Play audio data on the Linux audio device.  Replaced in Python 2.3 by the
    :mod:`ossaudiodev` module.
+   
+   .. warning:: The linuxaudiodev module has been removed in Python 3.0.
 
 :mod:`sunaudio`
    --- Interpret Sun audio headers (may become obsolete or a tool/demo).

Modified: python/trunk/Lib/test/test_linuxaudiodev.py
==============================================================================
--- python/trunk/Lib/test/test_linuxaudiodev.py	(original)
+++ python/trunk/Lib/test/test_linuxaudiodev.py	Sun May 11 02:50:51 2008
@@ -4,7 +4,7 @@
 from test.test_support import findfile, TestSkipped, run_unittest
 
 import errno
-import linuxaudiodev
+linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True)
 import sys
 import sunaudio
 import audioop

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Sun May 11 02:50:51 2008
@@ -133,7 +133,7 @@
                         'ihooks')
     inclusive_platforms = {'irix':('pure',)}
     # XXX Don't know if lib-tk is only installed if _tkinter is built.
-    optional_modules = ('bsddb185', 'Canvas', 'dl')
+    optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev')
 
     def check_removal(self, module_name, optional=False):
         """Make sure the specified module, when imported, raises a

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun May 11 02:50:51 2008
@@ -23,6 +23,8 @@
 Library
 -------
 
+- The linuxaudiodev module has been deprecated for removal in Python 3.0.
+
 - The ihooks module has been deprecated for removal in Python 3.0.
 
 - The fpformat module has been deprecated for removal in Python 3.0.

Modified: python/trunk/Modules/linuxaudiodev.c
==============================================================================
--- python/trunk/Modules/linuxaudiodev.c	(original)
+++ python/trunk/Modules/linuxaudiodev.c	Sun May 11 02:50:51 2008
@@ -469,6 +469,10 @@
 initlinuxaudiodev(void)
 {
     PyObject *m;
+    
+    if (PyErr_WarnPy3k("the linuxaudiodev module has been removed in "
+                    "Python 3.0; use the ossaudiodev module instead", 2) < 0)
+        return;
   
     m = Py_InitModule("linuxaudiodev", linuxaudiodev_methods);
     if (m == NULL)