summaryrefslogtreecommitdiffstats
path: root/Lib/plat-mac
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-04-03 16:41:20 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-04-03 16:41:20 (GMT)
commit920fd66ac6e723246baf6c3ed9f720675811bb15 (patch)
treef99e9ab8ddb72a3e6d0b4007287322575b1d30e8 /Lib/plat-mac
parent0ccc7bbb34100c1de1b407da741db06fe76bc227 (diff)
downloadcpython-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 'Lib/plat-mac')
-rw-r--r--Lib/plat-mac/Carbon/__init__.py2
-rwxr-xr-xLib/plat-mac/appletrunner.py2
2 files changed, 2 insertions, 2 deletions
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, ".*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)
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