[Python-checkins] r63271 - in python/trunk: Lib/test/test_py3kwarn.py Misc/NEWS Modules/fmmodule.c

[brett.cannon]

Author: brett.cannon
Date: Thu May 15 05:23:17 2008
New Revision: 63271

Log:
Deprecated 'fm' for removal in 3.0.

Modified:
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Misc/NEWS
   python/trunk/Modules/fmmodule.c

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Thu May 15 05:23:17 2008
@@ -133,7 +133,8 @@
                         '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',

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu May 15 05:23:17 2008
@@ -32,6 +32,8 @@
 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.
 

Modified: python/trunk/Modules/fmmodule.c
==============================================================================
--- python/trunk/Modules/fmmodule.c	(original)
+++ python/trunk/Modules/fmmodule.c	Thu May 15 05:23:17 2008
@@ -257,6 +257,11 @@
 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;