py/modmath: Check for zero division in log with 2 args.

dpgeorge · dpgeorge · commit 6b8b56f8596d · 2017-07-04T02:15:11.000+10:00
diff --git a/py/modmath.c b/py/modmath.c
@@ -168,6 +168,8 @@ STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {
         mp_float_t base = mp_obj_get_float(args[1]);
         if (base <= (mp_float_t)0.0) {
             math_error();
+        } else if (base == (mp_float_t)1.0) {
+            mp_raise_msg(&mp_type_ZeroDivisionError, "division by zero");
         }
         return mp_obj_new_float(l / MICROPY_FLOAT_C_FUN(log)(base));
     }
diff --git a/tests/float/math_fun.py b/tests/float/math_fun.py
@@ -51,13 +51,13 @@
                     ('atan2', atan2, ((1., 0.), (0., 1.), (2., 0.5), (-3., 5.), (-3., -4.),)),
                     ('fmod', fmod, ((1., 1.), (0., 1.), (2., 0.5), (-3., 5.), (-3., -4.),)),
                     ('ldexp', ldexp, ((1., 0), (0., 1), (2., 2), (3., -2), (-3., -4),)),
-                    ('log', log, ((2., 2.), (3., 2.), (4., 5.), (0., 1.), (1., 0.), (-1., 1.), (1., -1.))),
+                    ('log', log, ((2., 2.), (3., 2.), (4., 5.), (0., 1.), (1., 0.), (-1., 1.), (1., -1.), (2., 1.))),
                    ]
 
 for function_name, function, test_vals in binary_functions:
     print(function_name)
     for value1, value2 in test_vals:
         try:
             print("{:.5g}".format(function(value1, value2)))
-        except ValueError as e:
-            print(str(e))
+        except (ValueError, ZeroDivisionError) as e:
+            print(type(e))

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,8 @@ STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {`
`168`	`168`	`mp_float_t base = mp_obj_get_float(args[1]);`
`169`	`169`	`if (base <= (mp_float_t)0.0) {`
`170`	`170`	`math_error();`
	`171`	`+ } else if (base == (mp_float_t)1.0) {`
	`172`	`+ mp_raise_msg(&mp_type_ZeroDivisionError, "division by zero");`
`171`	`173`	`}`
`172`	`174`	`return mp_obj_new_float(l / MICROPY_FLOAT_C_FUN(log)(base));`
`173`	`175`	`}`