diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-04-03 16:41:20 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-04-03 16:41:20 (GMT) |
| commit | 920fd66ac6e723246baf6c3ed9f720675811bb15 (patch) | |
| tree | f99e9ab8ddb72a3e6d0b4007287322575b1d30e8 /Mac/Modules | |
| parent | 0ccc7bbb34100c1de1b407da741db06fe76bc227 (diff) | |
| download | cpython-920fd66ac6e723246baf6c3ed9f720675811bb15.zip cpython-920fd66ac6e723246baf6c3ed9f720675811bb15.tar.gz cpython-920fd66ac6e723246baf6c3ed9f720675811bb15.tar.bz2 | |
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.
Diffstat (limited to 'Mac/Modules')
| -rw-r--r-- | Mac/Modules/ColorPickermodule.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/MacOS.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/Nav.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/OSATerminology.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/icgluemodule.c | 2 |
5 files changed, 5 insertions, 5 deletions
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 @@ 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 bef7f88..19deb44 100644 --- 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 1c17776..f7b19b9 100644 --- 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 6a13aea..a7becf7 100644 --- 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 d995f16..70ca1e3 100644 --- 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 */ |