A bit of cleanup:

- When 'import exceptions' fails, don't suggest to use -v to print the traceback;
  this doesn't actually work.
- Remove comment about fallback to string exceptions.
- Remove a PyErr_Occurred() check after all is said and done that can
  never trigger.
- Remove static function newstdexception() which is no longer called.

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 43ce6e46299cff93088a9f5bf2ad68c1a428f1a0..698114eff47aaa394c45ce93c4cf40436dcf579f 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2440,9 +2440,9 @@ bltin_exc[] = {
 };
 
 
-/* import exceptions module to extract class exceptions.  on success,
- * return 1. on failure return 0 which signals _PyBuiltin_Init_2 to fall
- * back to using old-style string based exceptions.
+/* Import exceptions module to extract class exceptions.  On success,
+ * return 1.  On failure return 0 which signals _PyBuiltin_Init_2 to
+ * issue a fatal error.
  */
 static int
 init_class_exc(dict)
@@ -2457,14 +2457,7 @@ init_class_exc(dict)
        if (m == NULL ||
            (d = PyModule_GetDict(m)) == NULL)
        {
-               PySys_WriteStderr("'import exceptions' failed; ");
-               if (Py_VerboseFlag) {
-                       PySys_WriteStderr("traceback:\n");
-                       PyErr_Print();
-               }
-               else {
-                       PySys_WriteStderr("use -v for traceback\n");
-               }
+               PySys_WriteStderr("'import exceptions' failed\n");
                goto finally;
        }
        for (i = 0; bltin_exc[i].name; i++) {
@@ -2505,18 +2498,8 @@ init_class_exc(dict)
 
        /* we're done with the exceptions module */
        Py_DECREF(m);
-
-       if (PyErr_Occurred()) {
-           PySys_WriteStderr("Cannot initialize standard class exceptions; ");
-           if (Py_VerboseFlag) {
-                   PySys_WriteStderr("traceback:\n");
-                   PyErr_Print();
-           }
-           else
-                   PySys_WriteStderr("use -v for traceback\n");
-           goto finally;
-       }
        return 1;
+
   finally:
        Py_XDECREF(m);
        Py_XDECREF(args);
@@ -2533,18 +2516,6 @@ fini_instances()
 }
 
 
-static PyObject *
-newstdexception(dict, name)
-       PyObject *dict;
-       char *name;
-{
-       PyObject *v = PyString_FromString(name);
-       if (v == NULL || PyDict_SetItemString(dict, name, v) != 0)
-               Py_FatalError("Cannot create string-based exceptions");
-       return v;
-}
-
-
 static void
 finierrors()
 {