Ensure 'module removed' warning messages contain the word 'module' or 'package'.

This should fix the test_py3kwarn failure on OS X.  test_support.import_module
also requires this.

diff --git a/Lib/plat-mac/Carbon/__init__.py b/Lib/plat-mac/Carbon/__init__.py
index 6739bbdf9c87100024ac00abfc52ecec4ddd84ac..37a9ae3535ab6af59014920198f7937c2a47cef6 100644 (file)
--- a/Lib/plat-mac/Carbon/__init__.py
+++ b/Lib/plat-mac/Carbon/__init__.py
@@ -4,4 +4,4 @@ warnings.filterwarnings("ignore", "", FutureWarning, ".*Controls")
 warnings.filterwarnings("ignore", "", FutureWarning, ".*MacTextEditor")
 
 from warnings import warnpy3k
-warnpy3k("In 3.x, Carbon is removed.", stacklevel=2)
+warnpy3k("In 3.x, the Carbon package is removed.", stacklevel=2)

diff --git a/Lib/plat-mac/appletrunner.py b/Lib/plat-mac/appletrunner.py
index a2373aa856040dc2a8f3014b73b5316794bea8ac..cdfd417459831f58fc871f701c288ba20a603c22 100755 (executable)
--- a/Lib/plat-mac/appletrunner.py
+++ b/Lib/plat-mac/appletrunner.py
@@ -4,7 +4,7 @@
 # we are not running in a framework build.
 
 from warnings import warnpy3k
-warnpy3k("In 3.x, appletrunner is removed.", stacklevel=2)
+warnpy3k("In 3.x, the appletrunner module is removed.", stacklevel=2)
 
 import os
 import sys

diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c
index 440642622c70fb22bdf30f64d532bfdf5e21fd9b..51d7c37063edfbe16fc0474de37cf5131bb76548 100644 (file)
--- a/Mac/Modules/ColorPickermodule.c
+++ b/Mac/Modules/ColorPickermodule.c
@@ -71,7 +71,7 @@ void initColorPicker(void)
 {
        PyObject *m;
        
-       if (PyErr_WarnPy3k("In 3.x, ColorPicker is removed.", 1) < 0)
+       if (PyErr_WarnPy3k("In 3.x, the ColorPicker module is removed.", 1) < 0)
                return;
 
        /* Create the module and add the functions */

diff --git a/Mac/Modules/MacOS.c b/Mac/Modules/MacOS.c
index bef7f88ceee8e620be990380326362a70c529ce0..19deb44611a2be6b721bddf293eb4a998eb9c360 100644 (file)
--- a/Mac/Modules/MacOS.c
+++ b/Mac/Modules/MacOS.c
@@ -695,7 +695,7 @@ initMacOS(void)
 {
        PyObject *m, *d;
        
-       if (PyErr_WarnPy3k("In 3.x, MacOS is removed.", 1))
+       if (PyErr_WarnPy3k("In 3.x, the MacOS module is removed.", 1))
                return;
        
        m = Py_InitModule("MacOS", MacOS_Methods);

diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 1c1777663c46c4f9bec3943b27d5f133a3b2079c..f7b19b97fdb1ed599aceca79dd0b36c6f98b20da 100644 (file)
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -932,7 +932,7 @@ initNav(void)
 {
        PyObject *m, *d;
        
-       if (PyErr_WarnPy3k("In 3.x, Nav is removed.", 1))
+       if (PyErr_WarnPy3k("In 3.x, the Nav module is removed.", 1))
                return;
 
 #ifdef __LP64__

diff --git a/Mac/Modules/OSATerminology.c b/Mac/Modules/OSATerminology.c
index 6a13aeabae5255332a6228000414c053b6d41a0f..a7becf78593eb7e66c5728afa5f70f39a299b716 100644 (file)
--- a/Mac/Modules/OSATerminology.c
+++ b/Mac/Modules/OSATerminology.c
@@ -96,7 +96,7 @@ static struct PyMethodDef OSATerminology_methods[] =
 void
 initOSATerminology(void)
 {
-       if (PyErr_WarnPy3k("In 3.x, OSATerminology is removed.", 1) < 0)
+       if (PyErr_WarnPy3k("In 3.x, the OSATerminology module is removed.", 1) < 0)
                return;
        Py_InitModule("OSATerminology", OSATerminology_methods);
 }

diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index d995f1619adfa25b59d327b5393eb0bdfd82c5b6..70ca1e367650806ddcfba1a10ab7331846d16ae3 100644 (file)
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -454,7 +454,7 @@ initicglue(void)
 {
        PyObject *m, *d;
        
-       if (PyErr_WarnPy3k("In 3.x, icglue is removed.", 1))
+       if (PyErr_WarnPy3k("In 3.x, the icglue module is removed.", 1))
                return;
 
        /* Create the module and add the functions */