[Python-checkins] r63268 - in python/trunk: Lib/plat-irix5/FL.py Lib/plat-irix5/flp.py Lib/plat-irix6/FL.py Lib/plat-irix6/flp.py Lib/test/test_py3kwarn.py Misc/NEWS Modules/flmodule.c

[brett.cannon]

Author: brett.cannon
Date: Thu May 15 05:20:36 2008
New Revision: 63268

Log:
FL, flp, and fl from IRIX have been deprecated for removal in 3.0.

Modified:
   python/trunk/Lib/plat-irix5/FL.py
   python/trunk/Lib/plat-irix5/flp.py
   python/trunk/Lib/plat-irix6/FL.py
   python/trunk/Lib/plat-irix6/flp.py
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Misc/NEWS
   python/trunk/Modules/flmodule.c

Modified: python/trunk/Lib/plat-irix5/FL.py
==============================================================================
--- python/trunk/Lib/plat-irix5/FL.py	(original)
+++ python/trunk/Lib/plat-irix5/FL.py	Thu May 15 05:20:36 2008
@@ -2,6 +2,9 @@
 # This corresponds to "forms.h".
 # Recommended use: import FL; ... FL.NORMAL_BOX ... etc.
 # Alternate use: from FL import *; ... NORMAL_BOX ... etc.
+from warnings import warnpy3k
+warnpy3k("the FL module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 _v20 = 1
 _v21 = 1

Modified: python/trunk/Lib/plat-irix5/flp.py
==============================================================================
--- python/trunk/Lib/plat-irix5/flp.py	(original)
+++ python/trunk/Lib/plat-irix5/flp.py	Thu May 15 05:20:36 2008
@@ -3,6 +3,10 @@
 #
 # Jack Jansen, December 1991
 #
+from warnings import warnpy3k
+warnpy3k("the flp module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
+
 import string
 import os
 import sys

Modified: python/trunk/Lib/plat-irix6/FL.py
==============================================================================
--- python/trunk/Lib/plat-irix6/FL.py	(original)
+++ python/trunk/Lib/plat-irix6/FL.py	Thu May 15 05:20:36 2008
@@ -2,6 +2,9 @@
 # This corresponds to "forms.h".
 # Recommended use: import FL; ... FL.NORMAL_BOX ... etc.
 # Alternate use: from FL import *; ... NORMAL_BOX ... etc.
+from warnings import warnpy3k
+warnpy3k("the FL module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 _v20 = 1
 _v21 = 1

Modified: python/trunk/Lib/plat-irix6/flp.py
==============================================================================
--- python/trunk/Lib/plat-irix6/flp.py	(original)
+++ python/trunk/Lib/plat-irix6/flp.py	Thu May 15 05:20:36 2008
@@ -3,6 +3,10 @@
 #
 # Jack Jansen, December 1991
 #
+from warnings import warnpy3k
+warnpy3k("the flp module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
+
 import os
 import sys
 import FL

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Thu May 15 05:20:36 2008
@@ -133,7 +133,7 @@
                         'ihooks', 'mhlib')
     inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
-                                     'gl', 'ERRNO', 'FILE'),
+                                     'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu May 15 05:20:36 2008
@@ -32,6 +32,9 @@
 Library
 -------
 
+- The FL, flp, and fl modules from IRIX have been deprecated for removal in
+  Python 3.0.
+
 - The FILE module on IRIX has been deprecated for removal in Python 3.0.
 
 - The ERRNO module on IRIX has been deprecated for removal in Python 3.0.

Modified: python/trunk/Modules/flmodule.c
==============================================================================
--- python/trunk/Modules/flmodule.c	(original)
+++ python/trunk/Modules/flmodule.c	Thu May 15 05:20:36 2008
@@ -2128,6 +2128,11 @@
 PyMODINIT_FUNC
 initfl(void)
 {
+    
+    if (PyErr_WarnPy3k("the fl module has been removed in "
+                       "Python 3.0", 2) < 0)
+        return;
+    
 	Py_InitModule("fl", forms_methods);
 	if (m == NULL)
 		return;