From: Brett Cannon <bcannon@gmail.com>
Date: Thu, 15 May 2008 03:14:57 +0000 (+0000)
Subject: Deprecate ERRNO for removal in 3.0.
X-Git-Tag: v2.6b1~419
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2773b6f1c911e782bf1ed3ebd62b2e9ae6e53c70;p=thirdparty%2FPython%2Fcpython.git

Deprecate ERRNO for removal in 3.0.
---

diff --git a/Lib/plat-irix5/ERRNO.py b/Lib/plat-irix5/ERRNO.py
index d49e9641e455..d9ab7a4a9673 100755
--- a/Lib/plat-irix5/ERRNO.py
+++ b/Lib/plat-irix5/ERRNO.py
@@ -1,4 +1,7 @@
 # Generated by h2py from /usr/include/errno.h
+from warnings import warnpy3k
+warnpy3k("the ERRNO module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 # Included from sys/errno.h
 __KBASE = 1000
diff --git a/Lib/plat-irix6/ERRNO.py b/Lib/plat-irix6/ERRNO.py
index 1836fa04ef16..ec8720a5335c 100644
--- a/Lib/plat-irix6/ERRNO.py
+++ b/Lib/plat-irix6/ERRNO.py
@@ -1,4 +1,7 @@
 # Generated by h2py from /usr/include/errno.h
+from warnings import warnpy3k
+warnpy3k("the ERRNO module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 # Included from sys/errno.h
 
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 4a08c51df3c6..c49f75d7ab1b 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -133,7 +133,7 @@ class TestStdlibRemovals(unittest.TestCase):
                         'ihooks', 'mhlib')
     inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
-                                     'gl'),
+                                     'gl', 'ERRNO'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ff52841986d..a693dcacd5ed 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- The ERRNO module on IRIX has been deprecated for removal in Python 3.0.
+
 - The DEVICE, GL, gl, and cgen modules (which indirectly includes cgensupport)
   have been deprecated for removal in Python 3.0.