diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-05-16 14:52:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 14:52:11 -0400 |
| commit | 99e34e38eb6a81e0722b31b085c2f24ea1111981 (patch) | |
| tree | e739d3a3e733d447e28f1d65f64a8b77f03868a0 /py/objexcept.c | |
| parent | 54293397c5736e7e571a933c92dccf375d529b2b (diff) | |
| parent | 9a2cda7fd3917c3e4f57b4a8510bc7690945774a (diff) | |
Merge pull request #829 from jerryneedell/jerryn_i2c
add keyword timeout to I2C -- only used for bitbangioi
Diffstat (limited to 'py/objexcept.c')
| -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) |