diff options
| author | Matt Land <mland@sparefoot.com> | 2018-05-16 17:32:50 -0400 |
|---|---|---|
| committer | Matt Land <mland@sparefoot.com> | 2018-05-16 17:32:50 -0400 |
| commit | cc52f8efd96320f3e16729af30efaea3d8439c80 (patch) | |
| tree | fec54aee5b9db5e1aab071749e7ad6bc57fac598 /py | |
| parent | de885e81b1a0d77b8b2574dc9492d36a8b6dd678 (diff) | |
| parent | 0a185c4d2d6cfd148b35c23c3f8e23883d82befe (diff) | |
Merge branch 'feature-i2c-gemma' into feature-default-spi-circuit-playground
Diffstat (limited to 'py')
| -rw-r--r-- | py/objexcept.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index 4844c7f92..9ef2f2e34 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -275,9 +275,7 @@ MP_DEFINE_EXCEPTION(Exception, BaseException) MP_DEFINE_EXCEPTION(UnboundLocalError, NameError) */ MP_DEFINE_EXCEPTION(OSError, Exception) -#if MICROPY_PY_BUILTINS_TIMEOUTERROR - MP_DEFINE_EXCEPTION(TimeoutError, OSError) -#endif + MP_DEFINE_EXCEPTION(TimeoutError, OSError) /* MP_DEFINE_EXCEPTION(BlockingIOError, OSError) MP_DEFINE_EXCEPTION(ChildProcessError, OSError) |