Merging appropriate 2.1.1 fixes back into the main trunk.
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index c760107..5fdfe55 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -227,7 +227,7 @@
case smCyrillic:
return "mac-cyrillic";
default:
- return "mac-roman"; /* better than nothing */
+ return "ascii"; /* better than nothing */
}
}
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index 10c5a5f..b82395c 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -486,6 +486,11 @@
PyMac_FixGUSIcd();
#endif
}
+ /* Check that the first argument is a text file */
+ if ( PyMac_getfiletype(argv[1]) != 'TEXT' ) {
+ Alert(NOTASCRIPT_ID, NULL);
+ exit(0);
+ }
}
Py_Main(argc, argv);
}