mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 23:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Regularize exceptions.

Browse source
This commit is contained in:
Guido van Rossum 1991-12-16 15:42:38 +00:00
parent 0f1b8063b5
commit fb905c3ebf
3 changed files with 48 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Include/errors.h
View file

@ -33,23 +33,21 @@ void err_clear PROTO((void));
/* Predefined exceptions */ /* Predefined exceptions */
extern object *RuntimeError; extern object *AttributeError;
extern object *EOFError; extern object *EOFError;
extern object *TypeError; extern object *IOError;
extern object *IndexError;
extern object *KeyError;
extern object *KeyboardInterrupt;
extern object *MemoryError; extern object *MemoryError;
extern object *NameError; extern object *NameError;
extern object *SystemError;
extern object *KeyboardInterrupt;
/* New exceptions */
extern object *AttributeError;
extern object *IOError;
extern object *ZeroDivisionError;
extern object *IndexError;
extern object *ValueError;
extern object *KeyError;
extern object *OverflowError; extern object *OverflowError;
extern object *RuntimeError;
extern object *SyntaxError; extern object *SyntaxError;
extern object *SystemError;
extern object *TypeError;
extern object *ValueError;
extern object *ZeroDivisionError;
/* Convenience functions */ /* Convenience functions */

22
Include/pyerrors.h
View file

@ -33,23 +33,21 @@ void err_clear PROTO((void));
/* Predefined exceptions */ /* Predefined exceptions */
extern object *RuntimeError; extern object *AttributeError;
extern object *EOFError; extern object *EOFError;
extern object *TypeError; extern object *IOError;
extern object *IndexError;
extern object *KeyError;
extern object *KeyboardInterrupt;
extern object *MemoryError; extern object *MemoryError;
extern object *NameError; extern object *NameError;
extern object *SystemError;
extern object *KeyboardInterrupt;
/* New exceptions */
extern object *AttributeError;
extern object *IOError;
extern object *ZeroDivisionError;
extern object *IndexError;
extern object *ValueError;
extern object *KeyError;
extern object *OverflowError; extern object *OverflowError;
extern object *RuntimeError;
extern object *SyntaxError; extern object *SyntaxError;
extern object *SystemError;
extern object *TypeError;
extern object *ValueError;
extern object *ZeroDivisionError;
/* Convenience functions */ /* Convenience functions */

65
Python/bltinmodule.c
View file

@ -602,29 +602,27 @@ getbuiltin(name)
/* Predefined exceptions */ /* Predefined exceptions */
object *RuntimeError; object *AttributeError;
object *EOFError; object *EOFError;
object *TypeError; object *IOError;
object *IndexError;
object *KeyError;
object *KeyboardInterrupt;
object *MemoryError; object *MemoryError;
object *NameError; object *NameError;
object *SystemError;
object *KeyboardInterrupt;
/* New exceptions */
object *AttributeError;
object *IOError;
object *ZeroDivisionError;
object *IndexError;
object *ValueError;
object *KeyError;
object *OverflowError; object *OverflowError;
object *RuntimeError;
object *SyntaxError; object *SyntaxError;
object *SystemError;
object *TypeError;
object *ValueError;
object *ZeroDivisionError;
static object * static object *
newstdexception(name, message) newstdexception(name)
char *name, *message; char *name;
{ {
object *v = newstringobject(message); object *v = newstringobject(name);
if (v == NULL || dictinsert(builtin_dict, name, v) != 0) if (v == NULL || dictinsert(builtin_dict, name, v) != 0)
fatal("no mem for new standard exception"); fatal("no mem for new standard exception");
return v; return v;
@ -633,28 +631,21 @@ newstdexception(name, message)
static void static void
initerrors() initerrors()
{ {
RuntimeError = newstdexception("RuntimeError", "run-time error"); RuntimeError = newstdexception("RuntimeError");
EOFError = newstdexception("EOFError", "end-of-file read"); EOFError = newstdexception("EOFError");
TypeError = newstdexception("TypeError", "type error"); TypeError = newstdexception("TypeError");
MemoryError = newstdexception("MemoryError", "out of memory"); MemoryError = newstdexception("MemoryError");
NameError = newstdexception("NameError", "undefined name"); NameError = newstdexception("NameError");
SystemError = newstdexception("SystemError", "system error"); SystemError = newstdexception("SystemError");
KeyboardInterrupt = KeyboardInterrupt = newstdexception("KeyboardInterrupt");
newstdexception("KeyboardInterrupt", "keyboard interrupt"); AttributeError = newstdexception("AttributeError");
IOError = newstdexception("IOError");
/* New exceptions */ ZeroDivisionError = newstdexception("ZeroDivisionError");
AttributeError = IndexError = newstdexception("IndexError");
newstdexception("AttributeError", "undefined attribute"); ValueError = newstdexception("ValueError");
IOError = newstdexception("IOError", "I/O error"); KeyError = newstdexception("KeyError");
ZeroDivisionError = OverflowError = newstdexception("OverflowError");
newstdexception("ZeroDivisionError", "division by zero"); SyntaxError = newstdexception("SyntaxError");
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");
} }
void void