Deprecated torgb for removal in 3.0.

diff --git a/Lib/plat-irix5/torgb.py b/Lib/plat-irix5/torgb.py
index 54c86c477d1aaaff683fa455814ab8a491c8a033..024d1ea4889a45d9b88f896d3ca0d3596e14e623 100755 (executable)
--- a/Lib/plat-irix5/torgb.py
+++ b/Lib/plat-irix5/torgb.py
@@ -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

diff --git a/Lib/plat-irix6/torgb.py b/Lib/plat-irix6/torgb.py
index 54c86c477d1aaaff683fa455814ab8a491c8a033..024d1ea4889a45d9b88f896d3ca0d3596e14e623 100644 (file)
--- a/Lib/plat-irix6/torgb.py
+++ b/Lib/plat-irix6/torgb.py
@@ -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

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 2a591bc43362150ac318ceb06529b7a91c7fc2ab..66cd04bb8b3f1100f46e12df95cabe9f6b75a5fd 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -136,7 +136,7 @@ class TestStdlibRemovals(unittest.TestCase):
                                      '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',

diff --git a/Misc/NEWS b/Misc/NEWS
index 2608b7227163b1cf625515d7ec4941c6b967a9d6..98d0debe667f5846bf063d0e2fc1bc5b09a9ec3f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 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.