Deprecated 'fm' for removal in 3.0.

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index f3522bbbaf6d44190e970cae03cfb05e38aefde4..54b54f13af3d5190eef5c4cccb0af641494ec450 100644 (file)
--- 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 7154695bb19b8dfa0a1e7f0f1512ba84263d101b..cfa3c3a9dd0b44f75a41bda5e0ec34a9eab11618 100644 (file)
--- 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 1f7edb6873255c09cf37b23a6ccbeef42db46bc7..f3f0dc516c125882efa7e510bff9b5692ad0a13a 100644 (file)
--- 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;