diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-03 13:31:36 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-03 13:31:36 (GMT) |
| commit | cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14 (patch) | |
| tree | 1995f01bd8828ae9647ad407e40dd8584ca843da /Mac/Python | |
| parent | cb60dae6a1a7841138421866ea15870f6297cf8b (diff) | |
| download | cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.zip cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.tar.gz cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.tar.bz2 | |
Merging appropriate 2.1.1 fixes back into the main trunk.
Diffstat (limited to 'Mac/Python')
| -rw-r--r-- | Mac/Python/macglue.c | 2 | ||||
| -rw-r--r-- | Mac/Python/macmain.c | 5 |
2 files changed, 6 insertions, 1 deletions
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 @@ char *PyMac_getscript() 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_InitApplication() 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); } |