From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 14 May 2008 20:34:22 +0000 (+0000)
Subject: The cddb module for IRIX has been deprecated for 3.0.
X-Git-Tag: v2.6b1~430
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eebe49d07fe2f596af9774dc5ec2531b4229913;p=thirdparty%2FPython%2Fcpython.git

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 7b2711f0b18e..ea5e9fd465aa 100755
--- 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 45883054f817..b5584702c4ec 100644
--- 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 439a58ca3bf0..eca1989a2c90 100644
--- 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 ca667fbbd081..af174e15767e 100644
--- 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.