diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-05-15 03:20:36 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-05-15 03:20:36 (GMT) |
| commit | 178582e2a48dab04bb0a20b92d38a8280327dd6f (patch) | |
| tree | 2500c452f479f73f042288801073a22f678f89ff | |
| parent | 72ccc40db5e595a7e643f1966f6ee674c5d81551 (diff) | |
| download | cpython-178582e2a48dab04bb0a20b92d38a8280327dd6f.zip cpython-178582e2a48dab04bb0a20b92d38a8280327dd6f.tar.gz cpython-178582e2a48dab04bb0a20b92d38a8280327dd6f.tar.bz2 | |
FL, flp, and fl from IRIX have been deprecated for removal in 3.0.
| -rwxr-xr-x | Lib/plat-irix5/FL.py | 3 | ||||
| -rwxr-xr-x | Lib/plat-irix5/flp.py | 4 | ||||
| -rw-r--r-- | Lib/plat-irix6/FL.py | 3 | ||||
| -rw-r--r-- | Lib/plat-irix6/flp.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/flmodule.c | 5 |
7 files changed, 23 insertions, 1 deletions
diff --git a/Lib/plat-irix5/FL.py b/Lib/plat-irix5/FL.py index 727da4c..d1b3be1 100755 --- 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 4f9175f..13c926f 100755 --- 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 727da4c..d1b3be1 100644 --- 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 f745472..32e8b9d 100644 --- 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 8c84a11..f3522bb 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', 'ERRNO', 'FILE'), + 'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl'), 'darwin' : ('autoGIL', 'Carbon', 'OSATerminology', 'icglue', 'Nav', 'MacOS', 'aepack', 'aetools', 'aetypes', 'applesingle', @@ -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 e507c9f..20e74e9 100644 --- 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; |