[Python-checkins] CVS: python/dist/src/Modules main.c,1.58,1.59

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv3994

Modified Files:
	main.c 
Log Message:
Rename the -D option to -Q, to avoid a Jython option name conflict.


Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** main.c	2001/08/31 18:17:13	1.58
--- main.c	2001/09/04 03:25:00	1.59
***************
*** 30,34 ****
  
  /* command line options */
! #define BASE_OPTS "c:dD:EhiOStuUvVW:xX"
  
  #ifndef RISCOS
--- 30,34 ----
  
  /* command line options */
! #define BASE_OPTS "c:dEhiOQ:StuUvVW:xX"
  
  #ifndef RISCOS
***************
*** 51,63 ****
  -c cmd : program passed in as string (terminates option list)\n\
  -d     : debug output from parser (also PYTHONDEBUG=x)\n\
- -D arg : division options: -Dold (default), -Dwarn, -Dnew\n\
  -E     : ignore environment variables (such as PYTHONPATH)\n\
  -h     : print this help message and exit\n\
- ";
- static char *usage_2 = "\
  -i     : inspect interactively after running script, (also PYTHONINSPECT=x)\n\
           and force prompts, even if stdin does not appear to be a terminal\n\
  -O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
  -OO    : remove doc-strings in addition to the -O optimizations\n\
  -S     : don't imply 'import site' on initialization\n\
  -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
--- 51,63 ----
  -c cmd : program passed in as string (terminates option list)\n\
  -d     : debug output from parser (also PYTHONDEBUG=x)\n\
  -E     : ignore environment variables (such as PYTHONPATH)\n\
  -h     : print this help message and exit\n\
  -i     : inspect interactively after running script, (also PYTHONINSPECT=x)\n\
           and force prompts, even if stdin does not appear to be a terminal\n\
+ ";
+ static char *usage_2 = "\
  -O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
  -OO    : remove doc-strings in addition to the -O optimizations\n\
+ -Q arg : division options: -Qold (default), -Qwarn, -Qnew\n\
  -S     : don't imply 'import site' on initialization\n\
  -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
***************
*** 156,160 ****
  			break;
  
! 		case 'D':
  			if (strcmp(_PyOS_optarg, "old") == 0) {
  				Py_DivisionWarningFlag = 0;
--- 156,160 ----
  			break;
  
! 		case 'Q':
  			if (strcmp(_PyOS_optarg, "old") == 0) {
  				Py_DivisionWarningFlag = 0;
***************
*** 171,176 ****
  			}
  			fprintf(stderr,
! 				"-D option should be "
! 				"`-Dold', `-Dwarn' or `-Dnew' only\n");
  			usage(2, argv[0]);
  			/* NOTREACHED */
--- 171,176 ----
  			}
  			fprintf(stderr,
! 				"-Q option should be "
! 				"`-Qold', `-Qwarn' or `-Qnew' only\n");
  			usage(2, argv[0]);
  			/* NOTREACHED */