diff options
| author | Matt Land <mland@sparefoot.com> | 2018-05-16 17:07:58 -0400 |
|---|---|---|
| committer | Matt Land <mland@sparefoot.com> | 2018-05-16 17:07:58 -0400 |
| commit | 0a185c4d2d6cfd148b35c23c3f8e23883d82befe (patch) | |
| tree | f04540371579f8379c6898354083b4ba276450c4 /py | |
| parent | e8e75c056a884ce87d1a1e2eeea1ee266ba0fcd5 (diff) | |
| parent | 07c0a3227da24ef92e44a2457f94af71cc7f081c (diff) | |
Merge branch 'master' of https://github.com/adafruit/circuitpython into feature-i2c-gemma
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) |