Deprecate the sv module as per PEP 4.

diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index 7a5a7601c39183570a40ceb488053dd76604f8d2..981b0ce0cde863f766e4f9fe8978727a7ccc33aa 100644 (file)
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -226,4 +226,6 @@ of reality.
 
 :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.
 

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index ef4d0b9d921e5bef7e5c06bbf569a2b85417e7ba..3fa16db6c15279d9ae52348a88b967bf017f3664 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -132,7 +132,8 @@ class TestStdlibRemovals(unittest.TestCase):
                         '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

diff --git a/Misc/NEWS b/Misc/NEWS
index f6a334d4b9bbf8a6fab8b3173e99ddb9a67f8707..4065c8b2540f5f9df6dd0b52d208b9199b510e81 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@ Extension Modules
 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

diff --git a/Modules/svmodule.c b/Modules/svmodule.c
index fb58f19cc3517b09fd9db7b1faa3666c25223e8d..3845e20f6276f37c3ae921c6ffc9e09ec829517d 100644 (file)
--- a/Modules/svmodule.c
+++ b/Modules/svmodule.c
@@ -954,6 +954,10 @@ void
 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)