Deprecate the pure module for 3.0.

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index c66ff73f240943df964369779657f34fa3a3e5f4..48cd4e70154066c38cc4578c0b3c30de052497f0 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -129,8 +129,9 @@ class TestStdlibRemovals(unittest.TestCase):
     # test.testall not tested as it executes all unit tests as an
     # import side-effect.
     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new')
+    inclusive_platforms = {'irix':('pure',)}
 
-    def check_removal(self, module_name):
+    def check_removal(self, module_name, optional=False):
         """Make sure the specified module, when imported, raises a
         DeprecationWarning and specifies itself in the message."""
         original_module = None
@@ -145,6 +146,9 @@ class TestStdlibRemovals(unittest.TestCase):
                     __import__(module_name, level=0)
                 except DeprecationWarning as exc:
                     self.assert_(module_name in exc.args[0])
+                except ImportError:
+                    if not optional:
+                        raise
                 else:
                     self.fail("DeprecationWarning not raised for %s" %
                                 module_name)
@@ -159,6 +163,11 @@ class TestStdlibRemovals(unittest.TestCase):
         for module_name in self.all_platforms:
             self.check_removal(module_name)
 
+    def test_platform_specific_removals(self):
+        # Test the removal of platform-specific modules.
+        for module_name in self.inclusive_platforms.get(sys.platform, []):
+            self.check_removal(module_name, optional=True)
+
     def test_os_path_walk(self):
         msg = "In 3.x, os.path.walk is removed in favor of os.walk."
         def dumbo(where, names, args): pass

diff --git a/Misc/NEWS b/Misc/NEWS
index 2b7b52fa62e36cc66435949d7d6c8768e01abef5..41d3fe5bd8685db9f5c5ddcfa5f356049e548957 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,8 @@ Extension Modules
 Library
 -------
 
+- The pure module has been deprecated for removal in Python 3.0.
+
 - Issue #2487: change the semantics of math.ldexp(x, n) when n is too
   large to fit in a C long.  ldexp(x, n) now returns a zero (with
   suitable sign) if n is large and negative; previously, it raised

diff --git a/Modules/puremodule.c b/Modules/puremodule.c
index 95f4bdecdbc4d5b676d47cddb71e6d6f4d5396d6..ede63abe8e090b39fdcbedf9be382c2b2ff4458e 100644 (file)
--- a/Modules/puremodule.c
+++ b/Modules/puremodule.c
@@ -951,6 +951,10 @@ initpure()
 {
        PyObject *m, *d;
 
+       if (PyErr_WarnPy3k("the pure module has been removed in "
+                          "Python 3.0", 2) < 0)
+           return;     
+
        m = Py_InitModule("pure", pure_methods);
        if (m == NULL)
                return;