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

diff --git a/Lib/plat-irix5/FL.py b/Lib/plat-irix5/FL.py
index 727da4c9a00aa19d9a337d44d5cb2e1726a70f51..d1b3be1ef37d17fe7bb53720cb1b8f4a6f5901d8 100755 (executable)
--- a/Lib/plat-irix5/FL.py
+++ b/Lib/plat-irix5/FL.py
@@ -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

diff --git a/Lib/plat-irix5/flp.py b/Lib/plat-irix5/flp.py
index 4f9175f5fdb8673d8024a45e87d7051b1b241627..13c926f3ad73fc959293f9354ad0cce534b97e15 100755 (executable)
--- a/Lib/plat-irix5/flp.py
+++ b/Lib/plat-irix5/flp.py
@@ -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

diff --git a/Lib/plat-irix6/FL.py b/Lib/plat-irix6/FL.py
index 727da4c9a00aa19d9a337d44d5cb2e1726a70f51..d1b3be1ef37d17fe7bb53720cb1b8f4a6f5901d8 100644 (file)
--- a/Lib/plat-irix6/FL.py
+++ b/Lib/plat-irix6/FL.py
@@ -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

diff --git a/Lib/plat-irix6/flp.py b/Lib/plat-irix6/flp.py
index f745472a70d728c2330e2f330212b481d07641a7..32e8b9d27df4594698bccc7acf822dcdc6447183 100644 (file)
--- a/Lib/plat-irix6/flp.py
+++ b/Lib/plat-irix6/flp.py
@@ -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

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 8c84a1121528c428221eadc0865259d6deb5a295..f3522bbbaf6d44190e970cae03cfb05e38aefde4 100644 (file)
--- 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', 'ERRNO', 'FILE'),
+                                     'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index 13a5932faa7a36ce28a9a675369c6d4c4721bfab..7154695bb19b8dfa0a1e7f0f1512ba84263d101b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@ Extension Modules
 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.

diff --git a/Modules/flmodule.c b/Modules/flmodule.c
index e507c9fb58616071ff1c2174a620e77eb474a0c4..20e74e93065d06d8713e8365485608fb39b0c8e1 100644 (file)
--- a/Modules/flmodule.c
+++ b/Modules/flmodule.c
@@ -2128,6 +2128,11 @@ static PyMethodDef forms_methods[] = {
 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;