Commit f1bcdea
authored
Add 'static_exceptions' list to factorize code between
_PyExc_InitTypes() and _PyBuiltins_AddExceptions().
_PyExc_InitTypes() does nothing if it's not the main interpreter.
Sort exceptions in Lib/test/exception_hierarchy.txt.
1 parent a941e59 commit f1bcdea
5 files changed
Lines changed: 150 additions & 190 deletions
File tree
- Include/internal
- Lib/test
- Objects
- Python
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,7 +13,7 @@ extern "C" { | |||
| 13 | 13 | ||
| 14 | 14 | extern PyStatus _PyExc_InitState(PyInterpreterState *); | |
| 15 | 15 | extern PyStatus _PyExc_InitGlobalObjects(PyInterpreterState *); | |
| 16 | - extern PyStatus _PyExc_InitTypes(PyInterpreterState *); | ||
| 16 | + extern int _PyExc_InitTypes(PyInterpreterState *); | ||
| 17 | 17 | extern void _PyExc_Fini(PyInterpreterState *); | |
| 18 | 18 | ||
| 19 | 19 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -59,7 +59,7 @@ extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options); | |||
| 59 | 59 | extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config); | |
| 60 | 60 | extern int _PySys_UpdateConfig(PyThreadState *tstate); | |
| 61 | 61 | extern void _PySys_Fini(PyInterpreterState *interp); | |
| 62 | - extern PyStatus _PyBuiltins_AddExceptions(PyObject * bltinmod); | ||
| 62 | + extern int _PyBuiltins_AddExceptions(PyObject * bltinmod); | ||
| 63 | 63 | extern PyStatus _Py_HashRandomization_Init(const PyConfig *); | |
| 64 | 64 | ||
| 65 | 65 | extern PyStatus _PyImportZip_Init(PyThreadState *tstate); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,12 +1,9 @@ | |||
| 1 | 1 | BaseException | |
| 2 | - ├── SystemExit | ||
| 3 | - ├── KeyboardInterrupt | ||
| 4 | - ├── GeneratorExit | ||
| 5 | 2 | ├── BaseExceptionGroup | |
| 3 | + ├── GeneratorExit | ||
| 4 | + ├── KeyboardInterrupt | ||
| 5 | + ├── SystemExit | ||
| 6 | 6 | └── Exception | |
| 7 | - ├── ExceptionGroup [BaseExceptionGroup] | ||
| 8 | - ├── StopIteration | ||
| 9 | - ├── StopAsyncIteration | ||
| 10 | 7 | ├── ArithmeticError | |
| 11 | 8 | │ ├── FloatingPointError | |
| 12 | 9 | │ ├── OverflowError | |
@@ -15,6 +12,7 @@ BaseException | |||
| 15 | 12 | ├── AttributeError | |
| 16 | 13 | ├── BufferError | |
| 17 | 14 | ├── EOFError | |
| 15 | + ├── ExceptionGroup [BaseExceptionGroup] | ||
| 18 | 16 | ├── ImportError | |
| 19 | 17 | │ └── ModuleNotFoundError | |
| 20 | 18 | ├── LookupError | |
@@ -43,6 +41,8 @@ BaseException | |||
| 43 | 41 | ├── RuntimeError | |
| 44 | 42 | │ ├── NotImplementedError | |
| 45 | 43 | │ └── RecursionError | |
| 44 | + ├── StopAsyncIteration | ||
| 45 | + ├── StopIteration | ||
| 46 | 46 | ├── SyntaxError | |
| 47 | 47 | │ └── IndentationError | |
| 48 | 48 | │ └── TabError | |
@@ -54,14 +54,14 @@ BaseException | |||
| 54 | 54 | │ ├── UnicodeEncodeError | |
| 55 | 55 | │ └── UnicodeTranslateError | |
| 56 | 56 | └── Warning | |
| 57 | + ├── BytesWarning | ||
| 57 | 58 | ├── DeprecationWarning | |
| 59 | + ├── EncodingWarning | ||
| 60 | + ├── FutureWarning | ||
| 61 | + ├── ImportWarning | ||
| 58 | 62 | ├── PendingDeprecationWarning | |
| 63 | + ├── ResourceWarning | ||
| 59 | 64 | ├── RuntimeWarning | |
| 60 | 65 | ├── SyntaxWarning | |
| 61 | - ├── UserWarning | ||
| 62 | - ├── FutureWarning | ||
| 63 | - ├── ImportWarning | ||
| 64 | 66 | ├── UnicodeWarning | |
| 65 | - ├── BytesWarning | ||
| 66 | - ├── EncodingWarning | ||
| 67 | - └── ResourceWarning | ||
| 67 | + └── UserWarning | ||
0 commit comments