Rename the -D option to -Q, to avoid a Jython option name conflict.

Modules/main.c

@@ -29,7 +29,7 @@ static char **orig_argv;
 static int  orig_argc;
 
 /* command line options */
-#define BASE_OPTS "c:dD:EhiOStuUvVW:xX"
+#define BASE_OPTS "c:dEhiOQ:StuUvVW:xX"
 
 #ifndef RISCOS
 #define PROGRAM_OPTS BASE_OPTS
@@ -50,15 +50,15 @@ static char *usage_1 = "\
 Options and arguments (and corresponding environment variables):\n\
 -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\
+";
+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\
 -u     : unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x)\n\
@@ -155,7 +155,7 @@ Py_Main(int argc, char **argv)
 			Py_DebugFlag++;
 			break;
 
-		case 'D':
+		case 'Q':
 			if (strcmp(_PyOS_optarg, "old") == 0) {
 				Py_DivisionWarningFlag = 0;
 				break;
@@ -170,8 +170,8 @@ Py_Main(int argc, char **argv)
 				break;
 			}
 			fprintf(stderr,
-				"-D option should be "
-				"`-Dold', `-Dwarn' or `-Dnew' only\n");
+				"-Q option should be "
+				"`-Qold', `-Qwarn' or `-Qnew' only\n");
 			usage(2, argv[0]);
 			/* NOTREACHED */