Swap the sense of the -X option vis-a-vis Py_UseClassExceptionsFlag so

that class based exceptions are enabled by default.  -X disables them
in favor of the old-style string exceptions.

diff --git a/Modules/main.c b/Modules/main.c
index 92497dc33ad064861511f0a19bea6ba2bc0f1cc3..cc18dfae77dbd15320fd12145c92c873fe05fc3d 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -63,7 +63,7 @@ Options and arguments (and corresponding environment variables):\n\
          and force prompts, even if stdin does not appear to be a terminal.\n\
 -O     : optimize generated bytecode (a tad).\n\
 -u     : unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x)\n\
--X     : use experimental class based exceptions\n\
+-X     : disable class based built-in exceptions\n\
 -v     : verbose (trace import statements) (also PYTHONVERBOSE=x)\n\
 ";
 static char *usage_bot = "\
@@ -106,6 +106,7 @@ Py_Main(argc, argv)
        if ((p = getenv("PYTHONUNBUFFERED")) && *p != '\0')
                unbuffered = 1;
 
+       Py_UseClassExceptionsFlag = 1;
        while ((c = getopt(argc, argv, "c:diOuvX")) != EOF) {
                if (c == 'c') {
                        /* -c is the last option; following arguments
@@ -144,7 +145,7 @@ Py_Main(argc, argv)
                        break;
 
                case 'X':
-                       Py_UseClassExceptionsFlag++;
+                       Py_UseClassExceptionsFlag = 0;
                        break;
 
                /* This space reserved for other options */