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

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 9df41fbf1e84cb359cf5e7223123f4dcc1b88294..052c1ee9158423a5722023c6f5f415aad9005564 100644 (file)
--- 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;
 }