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 6739bbd..37a9ae3 100644
--- a/Lib/plat-mac/Carbon/__init__.py
+++ b/Lib/plat-mac/Carbon/__init__.py
@@ -4,4 +4,4 @@
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 a2373aa..cdfd417 100755
--- 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 4406426..51d7c37 100644
--- a/Mac/Modules/ColorPickermodule.c
+++ b/Mac/Modules/ColorPickermodule.c
@@ -71,7 +71,7 @@
{
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 bef7f88..19deb44 100644
--- a/Mac/Modules/MacOS.c
+++ b/Mac/Modules/MacOS.c
@@ -695,7 +695,7 @@
{
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 1c17776..f7b19b9 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -932,7 +932,7 @@
{
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 6a13aea..a7becf7 100644
--- a/Mac/Modules/OSATerminology.c
+++ b/Mac/Modules/OSATerminology.c
@@ -96,7 +96,7 @@
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 d995f16..70ca1e3 100644
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -454,7 +454,7 @@
{
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 */