From ac861b5a172a389f7d062fee6d88ded17e458b2e Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Mon, 12 May 2008 03:45:59 +0000 Subject: [PATCH] Deprecate the sv module as per PEP 4. --- Doc/library/undoc.rst | 2 ++ Lib/test/test_py3kwarn.py | 3 ++- Misc/NEWS | 2 ++ Modules/svmodule.c | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst index 7a5a7601c39..981b0ce0cde 100644 --- 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 ef4d0b9d921..3fa16db6c15 100644 --- 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 f6a334d4b9b..4065c8b2540 100644 --- 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 fb58f19cc35..3845e20f627 100644 --- 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)