Deprecate the cdplayer module for IRIX for 3.0.

diff --git a/Lib/plat-irix5/cdplayer.py b/Lib/plat-irix5/cdplayer.py
index 1c0168f7d2ed86b357551e5ac004ac83161d2971..9e4ba9c3187b5398e8f89ee36f67e98592492bbb 100755 (executable)
--- a/Lib/plat-irix5/cdplayer.py
+++ b/Lib/plat-irix5/cdplayer.py
@@ -13,6 +13,9 @@
 # It is also possible to set the above mentioned variables to new values.
 # You can then use c.write() to write out the changed values to the
 # .cdplayerrc file.
+from warnings import warnpy3k
+warnpy3k("the cdplayer module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 cdplayerrc = '.cdplayerrc'
 

diff --git a/Lib/plat-irix6/cdplayer.py b/Lib/plat-irix6/cdplayer.py
index d4bc7328ac9213ef40a840f42150480831693688..0f7983b0be683ffa9f656155655dee7c9cff741f 100644 (file)
--- a/Lib/plat-irix6/cdplayer.py
+++ b/Lib/plat-irix6/cdplayer.py
@@ -13,6 +13,9 @@
 # It is also possible to set the above mentioned variables to new values.
 # You can then use c.write() to write out the changed values to the
 # .cdplayerrc file.
+from warnings import warnpy3k
+warnpy3k("the cdplayer module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 cdplayerrc = '.cdplayerrc'
 

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index eca1989a2c9035cc8821e7da66bd4ed390963a70..2b9eac43e4bef48f35e30d02c103d2bf92db7dc8 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -131,7 +131,8 @@ class TestStdlibRemovals(unittest.TestCase):
     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
                         'Bastion', 'compiler', 'dircache', 'fpformat',
                         'ihooks', 'mhlib')
-    inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb'),
+    inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
+                                     'cdplayer'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index af174e15767ece4b33d1c673ffdc25866eb99b39..659cf72316a6fea24eb94190b26c4dfaebefb299 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- The cdplayer module for IRIX has been deprecated for removal in Python 3.0.
+
 - The cddb module for IRIX has been deprecated for removal in Python 3.0.
 
 - The cd and CD modules for IRIX have been deprecated for removal in