From: Brett Cannon <bcannon@gmail.com>
Date: Thu, 15 May 2008 03:41:55 +0000 (+0000)
Subject: Deprecate IOCTL from IRIX for removal in 3.0.
X-Git-Tag: v2.6b1~411
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8c41ecc1770d6661273a56cf77c177fb6291b30;p=python

Deprecate IOCTL from IRIX for removal in 3.0.
---

diff --git a/Lib/plat-irix5/IOCTL.py b/Lib/plat-irix5/IOCTL.py
index cec3c3f6a9..ffe0f932d0 100755
--- 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 cec3c3f6a9..ffe0f932d0 100644
--- 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 9964ad5993..f8e3961518 100644
--- 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 000b9a09b6..4fcb224a1f 100644
--- 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.