summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-15 03:23:17 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-05-15 03:23:17 (GMT)
commit75ba46509904cadf653d40c15da3b647a313a5b1 (patch)
tree742052e25e4e25a510900bb3d5b2180bbbb708cf
parent178582e2a48dab04bb0a20b92d38a8280327dd6f (diff)
downloadcpython-75ba46509904cadf653d40c15da3b647a313a5b1.zip
cpython-75ba46509904cadf653d40c15da3b647a313a5b1.tar.gz
cpython-75ba46509904cadf653d40c15da3b647a313a5b1.tar.bz2
Deprecated 'fm' for removal in 3.0.
-rw-r--r--Lib/test/test_py3kwarn.py3
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/fmmodule.c5
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index f3522bb..54b54f1 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -133,7 +133,8 @@ class TestStdlibRemovals(unittest.TestCase):
'ihooks', 'mhlib')
inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
- 'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl'),
+ 'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
+ 'fm'),
'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
'icglue', 'Nav', 'MacOS', 'aepack',
'aetools', 'aetypes', 'applesingle',
diff --git a/Misc/NEWS b/Misc/NEWS
index 7154695..cfa3c3a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
Library
-------
+- The fm module from IRIX has been deprecated for removal in Python 3.0.
+
- The FL, flp, and fl modules from IRIX have been deprecated for removal in
Python 3.0.
diff --git a/Modules/fmmodule.c b/Modules/fmmodule.c
index 1f7edb6..f3f0dc5 100644
--- a/Modules/fmmodule.c
+++ b/Modules/fmmodule.c
@@ -257,6 +257,11 @@ static PyMethodDef fm_methods[] = {
void
initfm(void)
{
+
+ if (PyErr_WarnPy3k("the fm module has been removed in "
+ "Python 3.0", 2) < 0)
+ return;
+
Py_InitModule("fm", fm_methods);
if (m == NULL)
return;