summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-15 03:20:36 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-05-15 03:20:36 (GMT)
commit178582e2a48dab04bb0a20b92d38a8280327dd6f (patch)
tree2500c452f479f73f042288801073a22f678f89ff /Lib
parent72ccc40db5e595a7e643f1966f6ee674c5d81551 (diff)
downloadcpython-178582e2a48dab04bb0a20b92d38a8280327dd6f.zip
cpython-178582e2a48dab04bb0a20b92d38a8280327dd6f.tar.gz
cpython-178582e2a48dab04bb0a20b92d38a8280327dd6f.tar.bz2
FL, flp, and fl from IRIX have been deprecated for removal in 3.0.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/plat-irix5/FL.py3
-rwxr-xr-xLib/plat-irix5/flp.py4
-rw-r--r--Lib/plat-irix6/FL.py3
-rw-r--r--Lib/plat-irix6/flp.py4
-rw-r--r--Lib/test/test_py3kwarn.py2
5 files changed, 15 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',