[Python-checkins] CVS: python/dist/src/Mac/Python macglue.c,1.97,1.98 macmain.c,1.65,1.66

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Python
In directory usw-pr-cvs1:/tmp/cvs-serv5116/Python

Modified Files:
	macglue.c macmain.c 
Log Message:
Merging appropriate 2.1.1 fixes back into the main trunk.


Index: macglue.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macglue.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** macglue.c	2001/07/12 21:48:10	1.97
--- macglue.c	2001/08/03 13:31:36	1.98
***************
*** 228,232 ****
          return "mac-cyrillic";
      default:
!         return "mac-roman"; /* better than nothing */
      }
  }
--- 228,232 ----
          return "mac-cyrillic";
      default:
!         return "ascii"; /* better than nothing */
      }
  }

Index: macmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macmain.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** macmain.c	2001/07/04 22:37:19	1.65
--- macmain.c	2001/08/03 13:31:36	1.66
***************
*** 487,490 ****
--- 487,495 ----
  #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);