summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-14 20:34:22 +0000
committerBrett Cannon <bcannon@gmail.com>2008-05-14 20:34:22 +0000
commit9eebe49d07fe2f596af9774dc5ec2531b4229913 (patch)
tree8c4d0f3d54c996fb96ac638c89aa7033d931c264
parentddf949f19432ef22b7b42a7054412f83985ff77f (diff)
downloadcpython-git-9eebe49d07fe2f596af9774dc5ec2531b4229913.tar.gz
The cddb module for IRIX has been deprecated for 3.0.
-rwxr-xr-xLib/plat-irix5/cddb.py3
-rw-r--r--Lib/plat-irix6/cddb.py3
-rw-r--r--Lib/test/test_py3kwarn.py2
-rw-r--r--Misc/NEWS2
4 files changed, 9 insertions, 1 deletions
diff --git a/Lib/plat-irix5/cddb.py b/Lib/plat-irix5/cddb.py
index 7b2711f0b1..ea5e9fd465 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 45883054f8..b5584702c4 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 439a58ca3b..eca1989a2c 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 ca667fbbd0..af174e1576 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.