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

[brett.cannon]

Author: brett.cannon
Date: Thu May 15 06:15:25 2008
New Revision: 63303

Log:
Deprecated torgb for removal in 3.0.

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

Modified: python/trunk/Lib/plat-irix5/torgb.py
==============================================================================
--- python/trunk/Lib/plat-irix5/torgb.py	(original)
+++ python/trunk/Lib/plat-irix5/torgb.py	Thu May 15 06:15:25 2008
@@ -5,6 +5,9 @@
 # Returned filename is either the input filename or a temporary filename;
 # in the latter case the caller must ensure that it is removed.
 # Other temporary files used are removed by the function.
+from warnings import warnpy3k
+warnpy3k("the torgb module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import os
 import tempfile

Modified: python/trunk/Lib/plat-irix6/torgb.py
==============================================================================
--- python/trunk/Lib/plat-irix6/torgb.py	(original)
+++ python/trunk/Lib/plat-irix6/torgb.py	Thu May 15 06:15:25 2008
@@ -5,6 +5,9 @@
 # Returned filename is either the input filename or a temporary filename;
 # in the latter case the caller must ensure that it is removed.
 # Other temporary files used are removed by the function.
+from warnings import warnpy3k
+warnpy3k("the torgb module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import os
 import tempfile

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 06:15:25 2008
@@ -136,7 +136,7 @@
                                      'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
                                      'fm', 'GET', 'GLWS', 'imgfile', 'IN',
                                      'IOCTL', 'jpeg', 'panel', 'panelparser',
-                                     'readcd', 'SV'),
+                                     'readcd', 'SV', 'torgb'),
                           '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 06:15:25 2008
@@ -32,6 +32,8 @@
 Library
 -------
 
+- The torgb module from IRIX has been deprecated for removal in Python 3.0.
+
 - The SV module from IRIX has been deprecated for removal in Python 3.0.
 
 - The readcd module from IRIX has been deprecated for removal in Python 3.0.