From f56b6aeb06b220ed78b951e7b5cec128db15444a Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 15 May 2008 04:15:25 +0000 Subject: [PATCH] Deprecated torgb for removal in 3.0. --- Lib/plat-irix5/torgb.py | 3 +++ Lib/plat-irix6/torgb.py | 3 +++ Lib/test/test_py3kwarn.py | 2 +- Misc/NEWS | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/plat-irix5/torgb.py b/Lib/plat-irix5/torgb.py index 54c86c477d1..024d1ea4889 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 54c86c477d1..024d1ea4889 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 2a591bc4336..66cd04bb8b3 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 2608b722716..98d0debe667 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.