summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorunknown <tools@python.org>2001-07-04 22:36:27 (GMT)
committerunknown <tools@python.org>2001-07-04 22:36:27 (GMT)
commitf428aef3b24e6839168f55dd6238739b4bbfb9fa (patch)
tree16fcae9593f1a0c3c190a0713391c3c886109a9d
parent31569561fdba94cce39a55a1e033755d06ee8640 (diff)
downloadcpython-f428aef3b24e6839168f55dd6238739b4bbfb9fa.zip
cpython-f428aef3b24e6839168f55dd6238739b4bbfb9fa.tar.gz
cpython-f428aef3b24e6839168f55dd6238739b4bbfb9fa.tar.bz2
Don't promise mac-japanese encoding as we don't have a codec for it.
Return a reasonable name for the general macos exception (MacOS.Error).
-rw-r--r--Mac/Python/macglue.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 9df41fb..052c1ee 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -221,8 +221,11 @@ char *PyMac_getscript()
else
return "mac-roman";
break;
+#if 0
+ /* We don't have a codec for this, so don't return it */
case smJapanese:
return "mac-japan";
+#endif
case smGreek:
return "mac-greek";
case smCyrillic:
@@ -467,7 +470,7 @@ PyObject *
PyMac_GetOSErrException()
{
if (PyMac_OSErrException == NULL)
- PyMac_OSErrException = PyString_FromString("Mac OS Error");
+ PyMac_OSErrException = PyString_FromString("MacOS.Error");
return PyMac_OSErrException;
}