[Python-checkins] r63297 - in python/trunk: Lib/plat-irix5/readcd.py Lib/plat-irix6/readcd.py Lib/test/test_py3kwarn.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Thu May 15 05:51:21 2008
New Revision: 63297

Log:
Deprecate readcd for removal in 3.0.

Modified:
   python/trunk/Lib/plat-irix5/readcd.py
   python/trunk/Lib/plat-irix6/readcd.py
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/plat-irix5/readcd.py
==============================================================================
--- python/trunk/Lib/plat-irix5/readcd.py	(original)
+++ python/trunk/Lib/plat-irix5/readcd.py	Thu May 15 05:51:21 2008
@@ -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
 

Modified: python/trunk/Lib/plat-irix6/readcd.py
==============================================================================
--- python/trunk/Lib/plat-irix6/readcd.py	(original)
+++ python/trunk/Lib/plat-irix6/readcd.py	Thu May 15 05:51:21 2008
@@ -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
 

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Thu May 15 05:51:21 2008
@@ -135,7 +135,8 @@
                                      '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',

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu May 15 05:51:21 2008
@@ -32,6 +32,8 @@
 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.