Deprecate IOCTL from IRIX for removal in 3.0.

diff --git a/Lib/plat-irix5/IOCTL.py b/Lib/plat-irix5/IOCTL.py
index cec3c3f6a934b9acc848059d096bd11d75ede41a..ffe0f932d0e567011fb0901305e1c63136b13408 100755 (executable)
--- a/Lib/plat-irix5/IOCTL.py
+++ b/Lib/plat-irix5/IOCTL.py
@@ -3,6 +3,9 @@
 # with some manual changes to cope with imperfections in h2py.py.
 # The applicability on other systems is not clear; especially non-SYSV
 # systems may have a totally different set of ioctls.
+from warnings import warnpy3k
+warnpy3k("the IOCTL module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 IOCTYPE = 0xff00
 LIOC = (ord('l')<<8)

diff --git a/Lib/plat-irix6/IOCTL.py b/Lib/plat-irix6/IOCTL.py
index cec3c3f6a934b9acc848059d096bd11d75ede41a..ffe0f932d0e567011fb0901305e1c63136b13408 100644 (file)
--- a/Lib/plat-irix6/IOCTL.py
+++ b/Lib/plat-irix6/IOCTL.py
@@ -3,6 +3,9 @@
 # with some manual changes to cope with imperfections in h2py.py.
 # The applicability on other systems is not clear; especially non-SYSV
 # systems may have a totally different set of ioctls.
+from warnings import warnpy3k
+warnpy3k("the IOCTL module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 IOCTYPE = 0xff00
 LIOC = (ord('l')<<8)

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 9964ad5993b551f17edeb7cb9c9850c28502cf6c..f8e396151860dd9ef72843b0a635c3c3f5560716 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -134,7 +134,8 @@ 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', 'GLWS', 'imgfile', 'IN'),
+                                     'fm', 'GET', 'GLWS', 'imgfile', 'IN',
+                                     'IOCTL'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index 000b9a09b6f8c796fdee21c46a7bcaf23f3e840b..4fcb224a1f3d3b8e01638994461de2fe18616a6b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- The IOCTL module from IRIX has been deprecated for removal in Python 3.0.
+
 - The IN module from IRIX has been deprecated for removal in Python 3.0.
 
 - The imgfile module from IRIX has been deprecated for removal in Python 3.0.