summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-15 03:29:18 +0000
committerBrett Cannon <bcannon@gmail.com>2008-05-15 03:29:18 +0000
commit707e384a7a42a90fd39754e89638ddadef722030 (patch)
tree71a6d0f01de88802b5370dabfa3d1d90a3ee01f4
parent82bd94e6510aed32d022267a56f398f926eb0907 (diff)
downloadcpython-git-707e384a7a42a90fd39754e89638ddadef722030.tar.gz
Deprecate GLWS from IRIX for removal in 3.0.
-rwxr-xr-xLib/plat-irix5/GLWS.py4
-rw-r--r--Lib/plat-irix6/GLWS.py4
-rw-r--r--Lib/test/test_py3kwarn.py2
-rw-r--r--Misc/NEWS4
4 files changed, 12 insertions, 2 deletions
diff --git a/Lib/plat-irix5/GLWS.py b/Lib/plat-irix5/GLWS.py
index 69dab7143f..c1338c73e0 100755
--- 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 69dab7143f..c1338c73e0 100644
--- 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 bc4a7a76c2..b7199a3c30 100644
--- 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 a1d6365487..3f7a6e008a 100644
--- 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.