Regularize exceptions.

diff --git a/Include/errors.h b/Include/errors.h
index 4972f18fb8bdfc010270dcd9ac39d78218cdf68a..b6735a7550dd42e55011892ed22428822d913cbf 100755 (executable)
--- a/Include/errors.h
+++ b/Include/errors.h
@@ -33,23 +33,21 @@ void err_clear PROTO((void));
 
 /* Predefined exceptions */
 
-extern object *RuntimeError;
-extern object *EOFError;
-extern object *TypeError;
-extern object *MemoryError;
-extern object *NameError;
-extern object *SystemError;
-extern object *KeyboardInterrupt;
-
-/* New exceptions */
 extern object *AttributeError;
+extern object *EOFError;
 extern object *IOError;
-extern object *ZeroDivisionError;
 extern object *IndexError;
-extern object *ValueError;
 extern object *KeyError;
+extern object *KeyboardInterrupt;
+extern object *MemoryError;
+extern object *NameError;
 extern object *OverflowError;
+extern object *RuntimeError;
 extern object *SyntaxError;
+extern object *SystemError;
+extern object *TypeError;
+extern object *ValueError;
+extern object *ZeroDivisionError;
 
 /* Convenience functions */
 

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 4972f18fb8bdfc010270dcd9ac39d78218cdf68a..b6735a7550dd42e55011892ed22428822d913cbf 100644 (file)
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -33,23 +33,21 @@ void err_clear PROTO((void));
 
 /* Predefined exceptions */
 
-extern object *RuntimeError;
-extern object *EOFError;
-extern object *TypeError;
-extern object *MemoryError;
-extern object *NameError;
-extern object *SystemError;
-extern object *KeyboardInterrupt;
-
-/* New exceptions */
 extern object *AttributeError;
+extern object *EOFError;
 extern object *IOError;
-extern object *ZeroDivisionError;
 extern object *IndexError;
-extern object *ValueError;
 extern object *KeyError;
+extern object *KeyboardInterrupt;
+extern object *MemoryError;
+extern object *NameError;
 extern object *OverflowError;
+extern object *RuntimeError;
 extern object *SyntaxError;
+extern object *SystemError;
+extern object *TypeError;
+extern object *ValueError;
+extern object *ZeroDivisionError;
 
 /* Convenience functions */
 

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 5bdf5d98fdf51d9f075f7db55feeb20460564dfd..1a9bfc68e1dd7a7bf37e3f938dbb7a7d4991401f 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -602,29 +602,27 @@ getbuiltin(name)
 
 /* Predefined exceptions */
 
-object *RuntimeError;
-object *EOFError;
-object *TypeError;
-object *MemoryError;
-object *NameError;
-object *SystemError;
-object *KeyboardInterrupt;
-
-/* New exceptions */
 object *AttributeError;
+object *EOFError;
 object *IOError;
-object *ZeroDivisionError;
 object *IndexError;
-object *ValueError;
 object *KeyError;
+object *KeyboardInterrupt;
+object *MemoryError;
+object *NameError;
 object *OverflowError;
+object *RuntimeError;
 object *SyntaxError;
+object *SystemError;
+object *TypeError;
+object *ValueError;
+object *ZeroDivisionError;
 
 static object *
-newstdexception(name, message)
-       char *name, *message;
+newstdexception(name)
+       char *name;
 {
-       object *v = newstringobject(message);
+       object *v = newstringobject(name);
        if (v == NULL || dictinsert(builtin_dict, name, v) != 0)
                fatal("no mem for new standard exception");
        return v;
@@ -633,28 +631,21 @@ newstdexception(name, message)
 static void
 initerrors()
 {
-       RuntimeError = newstdexception("RuntimeError", "run-time error");
-       EOFError = newstdexception("EOFError", "end-of-file read");
-       TypeError = newstdexception("TypeError", "type error");
-       MemoryError = newstdexception("MemoryError", "out of memory");
-       NameError = newstdexception("NameError", "undefined name");
-       SystemError = newstdexception("SystemError", "system error");
-       KeyboardInterrupt =
-               newstdexception("KeyboardInterrupt", "keyboard interrupt");
-       
-       /* New exceptions */
-       AttributeError =
-               newstdexception("AttributeError", "undefined attribute");
-       IOError = newstdexception("IOError", "I/O error");
-       ZeroDivisionError =
-               newstdexception("ZeroDivisionError", "division by zero");
-       IndexError = newstdexception("IndexError", "index out of range");
-       ValueError = newstdexception("ValueError", "unacceptable value");
-       KeyError = newstdexception("KeyError", "invalid key");
-       OverflowError =
-               newstdexception("OverflowError", "arithmetic overflow");
-       SyntaxError =
-               newstdexception("SyntaxError", "syntax error");
+       RuntimeError = newstdexception("RuntimeError");
+       EOFError = newstdexception("EOFError");
+       TypeError = newstdexception("TypeError");
+       MemoryError = newstdexception("MemoryError");
+       NameError = newstdexception("NameError");
+       SystemError = newstdexception("SystemError");
+       KeyboardInterrupt = newstdexception("KeyboardInterrupt");
+       AttributeError = newstdexception("AttributeError");
+       IOError = newstdexception("IOError");
+       ZeroDivisionError = newstdexception("ZeroDivisionError");
+       IndexError = newstdexception("IndexError");
+       ValueError = newstdexception("ValueError");
+       KeyError = newstdexception("KeyError");
+       OverflowError = newstdexception("OverflowError");
+       SyntaxError = newstdexception("SyntaxError");
 }
 
 void