diff options
| author | Lucian Copeland <hierophect@gmail.com> | 2020-09-14 10:44:31 -0400 |
|---|---|---|
| committer | Lucian Copeland <hierophect@gmail.com> | 2020-09-14 10:44:31 -0400 |
| commit | ecc219fe504f348d5dceb13b0a12d04d1c858781 (patch) | |
| tree | 3e6d79d558e821e3daac90b711275be5c0153015 /py/objexcept.c | |
| parent | f95ad7b27c040e54daeb4c71d6bb6c35844be66e (diff) | |
| parent | 94e261370b4ffc7739d6e3e0ca99db9f36f3027b (diff) | |
Merge remote-tracking branch 'upstream/main' into esp32-displayio-fix
Diffstat (limited to 'py/objexcept.c')
| -rw-r--r-- | py/objexcept.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index e3b953543..01ba6da9c 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -282,15 +282,17 @@ MP_DEFINE_EXCEPTION(Exception, BaseException) MP_DEFINE_EXCEPTION(UnboundLocalError, NameError) */ MP_DEFINE_EXCEPTION(OSError, Exception) - MP_DEFINE_EXCEPTION(TimeoutError, OSError) - /* - MP_DEFINE_EXCEPTION(BlockingIOError, OSError) - MP_DEFINE_EXCEPTION(ChildProcessError, OSError) + MP_DEFINE_EXCEPTION(TimeoutError, OSError) MP_DEFINE_EXCEPTION(ConnectionError, OSError) MP_DEFINE_EXCEPTION(BrokenPipeError, ConnectionError) + /* MP_DEFINE_EXCEPTION(ConnectionAbortedError, ConnectionError) MP_DEFINE_EXCEPTION(ConnectionRefusedError, ConnectionError) MP_DEFINE_EXCEPTION(ConnectionResetError, ConnectionError) + */ + /* + MP_DEFINE_EXCEPTION(BlockingIOError, OSError) + MP_DEFINE_EXCEPTION(ChildProcessError, OSError) MP_DEFINE_EXCEPTION(InterruptedError, OSError) MP_DEFINE_EXCEPTION(IsADirectoryError, OSError) MP_DEFINE_EXCEPTION(NotADirectoryError, OSError) |