From: Brett Cannon <bcannon@gmail.com>
Date: Thu, 15 May 2008 04:15:25 +0000 (+0000)
Subject: Deprecated torgb for removal in 3.0.
X-Git-Tag: v2.6b1~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f56b6aeb06b220ed78b951e7b5cec128db15444a;p=thirdparty%2FPython%2Fcpython.git

Deprecated torgb for removal in 3.0.
---

diff --git a/Lib/plat-irix5/torgb.py b/Lib/plat-irix5/torgb.py
index 54c86c477d1a..024d1ea4889a 100755
--- 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 54c86c477d1a..024d1ea4889a 100644
--- 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 2a591bc43362..66cd04bb8b3f 100644
--- 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 2608b7227163..98d0debe667f 100644
--- 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.