Deprecate GLWS from IRIX for removal in 3.0.

diff --git a/Lib/plat-irix5/GLWS.py b/Lib/plat-irix5/GLWS.py
index 69dab7143f12c9bbc805738f01c92b3159003c89..c1338c73e0244bc80b8a778572fa0de92bd75968 100755 (executable)
--- a/Lib/plat-irix5/GLWS.py
+++ b/Lib/plat-irix5/GLWS.py
@@ -1,3 +1,7 @@
+from warnings import warnpy3k
+warnpy3k("the GLWS module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
+
 NOERROR = 0
 NOCONTEXT = -1
 NODISPLAY = -2

diff --git a/Lib/plat-irix6/GLWS.py b/Lib/plat-irix6/GLWS.py
index 69dab7143f12c9bbc805738f01c92b3159003c89..c1338c73e0244bc80b8a778572fa0de92bd75968 100644 (file)
--- a/Lib/plat-irix6/GLWS.py
+++ b/Lib/plat-irix6/GLWS.py
@@ -1,3 +1,7 @@
+from warnings import warnpy3k
+warnpy3k("the GLWS module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
+
 NOERROR = 0
 NOCONTEXT = -1
 NODISPLAY = -2

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index bc4a7a76c245501c7aef7c8b5a667e70257b4b6e..b7199a3c30e6a310cd70c1157cd5a589ceab3c72 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -134,7 +134,7 @@ class TestStdlibRemovals(unittest.TestCase):
     inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
                                      'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
-                                     'fm', 'GET'),
+                                     'fm', 'GET', 'GLWS'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index a1d6365487f7237359f7d3de333195e8ddb4e1c9..3f7a6e008a396d3d99bb1bc9026d096ed526b68e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,7 +32,9 @@ Extension Modules
 Library
 -------
 
-- The GET module from IRIX has been deprecate for removal in Python 3.0.
+- The GLWS module from IRIX has been deprecated for removal in Python 3.0.
+
+- The GET module from IRIX has been deprecated for removal in Python 3.0.
 
 - The fm module from IRIX has been deprecated for removal in Python 3.0.