Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Mark Dickinson 2010-04-03 16:41:20 +00:00
parent 0ccc7bbb34
commit 920fd66ac6
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/plat-mac/Carbon/__init__.py
View File

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

2
Lib/plat-mac/appletrunner.py
View File

@ -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

2
Mac/Modules/ColorPickermodule.c
View File

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

2
Mac/Modules/MacOS.c
View File

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

2
Mac/Modules/Nav.c
View File

@ -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__

2
Mac/Modules/OSATerminology.c
View File

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

2
Mac/Modules/icgluemodule.c
View File

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