Deprecate readcd for removal in 3.0.

diff --git a/Lib/plat-irix5/readcd.py b/Lib/plat-irix5/readcd.py
index 5453ce42130f069812a6520270b33788210ca04f..54549e792cb074ec07c47483ed6b6bdc8fe2aa88 100755 (executable)
--- a/Lib/plat-irix5/readcd.py
+++ b/Lib/plat-irix5/readcd.py
@@ -1,4 +1,7 @@
 # Class interface to the CD module.
+from warnings import warnpy3k
+warnpy3k("the readcd module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import cd, CD
 

diff --git a/Lib/plat-irix6/readcd.py b/Lib/plat-irix6/readcd.py
index 5453ce42130f069812a6520270b33788210ca04f..54549e792cb074ec07c47483ed6b6bdc8fe2aa88 100644 (file)
--- a/Lib/plat-irix6/readcd.py
+++ b/Lib/plat-irix6/readcd.py
@@ -1,4 +1,7 @@
 # Class interface to the CD module.
+from warnings import warnpy3k
+warnpy3k("the readcd module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import cd, CD
 

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 7d5e0a0e8d6b2dd489f744d068408040614c1dd6..6f53ff0ffec0ecaea37efb9e29b8d8848d902f27 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -135,7 +135,8 @@ class TestStdlibRemovals(unittest.TestCase):
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
                                      'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
                                      'fm', 'GET', 'GLWS', 'imgfile', 'IN',
-                                     'IOCTL', 'jpeg', 'panel'),
+                                     'IOCTL', 'jpeg', 'panel', 'panelparser',
+                                     'readcd'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index 1421bde2e6eec4cbe46b3c8e5f7ab3ce6639c8d8..dae8a160ae378c81ea900f17e447c763cd707990 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- The readcd module from IRIX has been deprecated for removal in Python 3.0.
+
 - The panelparser module from IRIX has been deprecated for removal in
   Python 3.0.