summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-14 21:08:41 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-05-14 21:08:41 (GMT)
commit54c77aa4595a9896f45390d0d0ce6ff47870cca0 (patch)
treeefa620f2daf0d00ba1a6682d86a1c07312807366
parent9eebe49d07fe2f596af9774dc5ec2531b4229913 (diff)
downloadcpython-54c77aa4595a9896f45390d0d0ce6ff47870cca0.zip
cpython-54c77aa4595a9896f45390d0d0ce6ff47870cca0.tar.gz
cpython-54c77aa4595a9896f45390d0d0ce6ff47870cca0.tar.bz2
Deprecate the cdplayer module for IRIX for 3.0.
-rwxr-xr-xLib/plat-irix5/cdplayer.py3
-rw-r--r--Lib/plat-irix6/cdplayer.py3
-rw-r--r--Lib/test/test_py3kwarn.py3
-rw-r--r--Misc/NEWS2
4 files changed, 10 insertions, 1 deletions
diff --git a/Lib/plat-irix5/cdplayer.py b/Lib/plat-irix5/cdplayer.py
index 1c0168f..9e4ba9c 100755
--- 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 d4bc732..0f7983b 100644
--- 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 eca1989..2b9eac4 100644
--- 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 af174e1..659cf72 100644
--- 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