[Python-checkins] r63149 - in python/trunk: Doc/library/undoc.rst Lib/test/test_py3kwarn.py Misc/NEWS Modules/svmodule.c

[brett.cannon]

Author: brett.cannon
Date: Mon May 12 05:45:59 2008
New Revision: 63149

Log:
Deprecate the sv module as per PEP 4.


Modified:
   python/trunk/Doc/library/undoc.rst
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Misc/NEWS
   python/trunk/Modules/svmodule.c

Modified: python/trunk/Doc/library/undoc.rst
==============================================================================
--- python/trunk/Doc/library/undoc.rst	(original)
+++ python/trunk/Doc/library/undoc.rst	Mon May 12 05:45:59 2008
@@ -226,4 +226,6 @@
 
 :mod:`sv`
    --- Interface to the "simple video" board on SGI Indigo (obsolete hardware).
+   
+   .. warning:: The :mod:`sv` module has been removed in Python 3.0.
 

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Mon May 12 05:45:59 2008
@@ -132,7 +132,8 @@
                         'Bastion', 'compiler', 'dircache', 'fpformat',
                         'ihooks', 'mhlib')
     inclusive_platforms = {'irix':('pure',)}
-    optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop')
+    optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop',
+                        'sv')
 
     def check_removal(self, module_name, optional=False):
         """Make sure the specified module, when imported, raises a

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon May 12 05:45:59 2008
@@ -26,6 +26,8 @@
 Library
 -------
 
+- The sv module has been deprecated for removal in Python 3.0.
+
 - The multifile module has been deprecated as per PEP 4.
 
 - The SocketServer module has been renamed 'socketserver'.  The old

Modified: python/trunk/Modules/svmodule.c
==============================================================================
--- python/trunk/Modules/svmodule.c	(original)
+++ python/trunk/Modules/svmodule.c	Mon May 12 05:45:59 2008
@@ -954,6 +954,10 @@
 initsv(void)
 {
 	PyObject *m, *d;
+	
+	if (PyErr_WarnPy3k("the sv module has been removed in "
+	                   "Python 3.0", 2) < 0)
+	    return;
 
 	m = Py_InitModule("sv", sv_methods);
 	if (m == NULL)