[Python-checkins] r79707 - in python/trunk: Lib/plat-mac/Carbon/__init__.py Lib/plat-mac/appletrunner.py Mac/Modules/ColorPickermodule.c Mac/Modules/MacOS.c Mac/Modules/Nav.c Mac/Modules/OSATerminology.c Mac/Modules/icgluemodule.c

mark.dickinson python-checkins at python.org
Sat Apr 3 18:41:20 CEST 2010


Author: mark.dickinson
Date: Sat Apr  3 18:41:20 2010
New Revision: 79707

Log:
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.


Modified:
   python/trunk/Lib/plat-mac/Carbon/__init__.py
   python/trunk/Lib/plat-mac/appletrunner.py
   python/trunk/Mac/Modules/ColorPickermodule.c
   python/trunk/Mac/Modules/MacOS.c
   python/trunk/Mac/Modules/Nav.c
   python/trunk/Mac/Modules/OSATerminology.c
   python/trunk/Mac/Modules/icgluemodule.c

Modified: python/trunk/Lib/plat-mac/Carbon/__init__.py
==============================================================================
--- python/trunk/Lib/plat-mac/Carbon/__init__.py	(original)
+++ python/trunk/Lib/plat-mac/Carbon/__init__.py	Sat Apr  3 18:41:20 2010
@@ -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)

Modified: python/trunk/Lib/plat-mac/appletrunner.py
==============================================================================
--- python/trunk/Lib/plat-mac/appletrunner.py	(original)
+++ python/trunk/Lib/plat-mac/appletrunner.py	Sat Apr  3 18:41:20 2010
@@ -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

Modified: python/trunk/Mac/Modules/ColorPickermodule.c
==============================================================================
--- python/trunk/Mac/Modules/ColorPickermodule.c	(original)
+++ python/trunk/Mac/Modules/ColorPickermodule.c	Sat Apr  3 18:41:20 2010
@@ -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 */

Modified: python/trunk/Mac/Modules/MacOS.c
==============================================================================
--- python/trunk/Mac/Modules/MacOS.c	(original)
+++ python/trunk/Mac/Modules/MacOS.c	Sat Apr  3 18:41:20 2010
@@ -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);

Modified: python/trunk/Mac/Modules/Nav.c
==============================================================================
--- python/trunk/Mac/Modules/Nav.c	(original)
+++ python/trunk/Mac/Modules/Nav.c	Sat Apr  3 18:41:20 2010
@@ -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__

Modified: python/trunk/Mac/Modules/OSATerminology.c
==============================================================================
--- python/trunk/Mac/Modules/OSATerminology.c	(original)
+++ python/trunk/Mac/Modules/OSATerminology.c	Sat Apr  3 18:41:20 2010
@@ -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);
 }

Modified: python/trunk/Mac/Modules/icgluemodule.c
==============================================================================
--- python/trunk/Mac/Modules/icgluemodule.c	(original)
+++ python/trunk/Mac/Modules/icgluemodule.c	Sat Apr  3 18:41:20 2010
@@ -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 */


More information about the Python-checkins mailing list