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.

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)

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

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 */

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);

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__

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);
 }

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 */