diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-06-29 22:45:39 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-07-02 11:53:08 +0200 |
| commit | 077812b2abe3f5e5325194f9694dad7eb38186dd (patch) | |
| tree | 61db6e4f1d4c4ab954e92b77272fb32936598758 /py/objexcept.c | |
| parent | bdf958df30539f399edef8650947d7ff4048a8ca (diff) | |
py: Add TimeoutError exception subclassed from OSError.
The TimeoutError is useful for some modules, specially the the
socket module. TimeoutError can then be alised to socket.timeout
and then Python code can differentiate between socket.error and
socket.timeout.
Diffstat (limited to 'py/objexcept.c')
| -rw-r--r-- | py/objexcept.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index 6c108d99c..75369bac7 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -221,8 +221,11 @@ MP_DEFINE_EXCEPTION(Exception, BaseException) MP_DEFINE_EXCEPTION(UnboundLocalError, NameError) */ MP_DEFINE_EXCEPTION(OSError, Exception) - /* +#if MICROPY_PY_BUILTINS_TIMEOUTERROR MP_DEFINE_EXCEPTION_BASE(OSError) + MP_DEFINE_EXCEPTION(TimeoutError, OSError) +#endif + /* MP_DEFINE_EXCEPTION(BlockingIOError, OSError) MP_DEFINE_EXCEPTION(ChildProcessError, OSError) MP_DEFINE_EXCEPTION(ConnectionError, OSError) @@ -235,7 +238,6 @@ MP_DEFINE_EXCEPTION(Exception, BaseException) MP_DEFINE_EXCEPTION(NotADirectoryError, OSError) MP_DEFINE_EXCEPTION(PermissionError, OSError) MP_DEFINE_EXCEPTION(ProcessLookupError, OSError) - MP_DEFINE_EXCEPTION(TimeoutError, OSError) MP_DEFINE_EXCEPTION(FileExistsError, OSError) MP_DEFINE_EXCEPTION(FileNotFoundError, OSError) MP_DEFINE_EXCEPTION(ReferenceError, Exception) |