diff options
| -rw-r--r-- | Doc/library/undoc.rst | 2 | ||||
| -rw-r--r-- | Lib/test/test_linuxaudiodev.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/linuxaudiodev.c | 4 |
5 files changed, 10 insertions, 2 deletions
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst index deff5e2a16..7da1b3b067 100644 --- a/Doc/library/undoc.rst +++ b/Doc/library/undoc.rst @@ -54,6 +54,8 @@ Multimedia :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). diff --git a/Lib/test/test_linuxaudiodev.py b/Lib/test/test_linuxaudiodev.py index 303490bcdc..813df6fc73 100644 --- a/Lib/test/test_linuxaudiodev.py +++ b/Lib/test/test_linuxaudiodev.py @@ -4,7 +4,7 @@ test_support.requires('audio') 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 diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 3371697a00..6835fa8efe 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -133,7 +133,7 @@ class TestStdlibRemovals(unittest.TestCase): '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 @@ -23,6 +23,8 @@ Extension Modules 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. diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c index 730ec0cde3..80077c6f1e 100644 --- a/Modules/linuxaudiodev.c +++ b/Modules/linuxaudiodev.c @@ -469,6 +469,10 @@ void 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) |