diff options
| author | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-02-07 22:26:13 +0100 |
|---|---|---|
| committer | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-02-07 22:26:13 +0100 |
| commit | 4cf7fd151e98a3d842eb5c9428545cb67ddd57ee (patch) | |
| tree | 947f265a2d498f4879bab3c7d19591133c56c1a0 /py/objcomplex.c | |
| parent | 9397583f6c99533fc4c0a2753126120a8552ba4c (diff) | |
| parent | 21f08524baf11e62384814b7cb8fcd2b5a8998fb (diff) | |
Merge branch 'master' into nrf52
Diffstat (limited to 'py/objcomplex.c')
| -rw-r--r-- | py/objcomplex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objcomplex.c b/py/objcomplex.c index 96be25255..426e76e5f 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -222,8 +222,8 @@ mp_obj_t mp_obj_complex_binary_op(mp_uint_t op, mp_float_t lhs_real, mp_float_t // = exp(x3)*(cos(y3) + i*sin(y3)) mp_float_t abs1 = MICROPY_FLOAT_C_FUN(sqrt)(lhs_real*lhs_real + lhs_imag*lhs_imag); if (abs1 == 0) { - if (rhs_imag == 0) { - lhs_real = 1; + if (rhs_imag == 0 && rhs_real >= 0) { + lhs_real = (rhs_real == 0); rhs_real = 0; } else { mp_raise_msg(&mp_type_ZeroDivisionError, "0.0 to a complex power"); |