The cddb module for IRIX has been deprecated for 3.0.

diff --git a/Lib/plat-irix5/cddb.py b/Lib/plat-irix5/cddb.py
index 7b2711f0b18e4a906694decd386f95242f6ed6bb..ea5e9fd465aab0216129acf723529295d7adad78 100755 (executable)
--- a/Lib/plat-irix5/cddb.py
+++ b/Lib/plat-irix5/cddb.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 cddb module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import string, posix, os
 

diff --git a/Lib/plat-irix6/cddb.py b/Lib/plat-irix6/cddb.py
index 45883054f817e011de3151175e3f7942f7f15b72..b5584702c4ecf5573538d9a04b0699413b98afab 100644 (file)
--- a/Lib/plat-irix6/cddb.py
+++ b/Lib/plat-irix6/cddb.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 cddb module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import string, posix, os
 

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 439a58ca3bf08c89ddb7ae925e818da1ac43df22..eca1989a2c9035cc8821e7da66bd4ed390963a70 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -131,7 +131,7 @@ 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'),
+    inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index ca667fbbd081e2accbf63707d4b6f9aa3b2ed574..af174e15767ece4b33d1c673ffdc25866eb99b39 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- 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
   Python 3.0.