Skip to content

Commit 8e023a4

Browse files
committed
BUG: integer 0 to a negative power should error.
Fixes numpygh-7510.
1 parent 1fc180b commit 8e023a4

3 files changed

Lines changed: 20 additions & 14 deletions

File tree

‎numpy/core/src/umath/loops.c.src‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,17 @@ NPY_NO_EXPORT void
921921
*((@type@ *)op1) = 1;
922922
continue;
923923
}
924-
if (in2 < 0 || in1 == 0) {
924+
925+
if (in1 == 0 && in2 < 0) {
926+
NPY_ALLOW_C_API_DEF
927+
NPY_ALLOW_C_API;
928+
PyErr_SetString(PyExc_ZeroDivisionError,
929+
"0 cannot be raised to a negative power.");
930+
NPY_DISABLE_C_API;
931+
return;
932+
}
933+
934+
if (in2 < 0) {
925935
*((@type@ *)op1) = 0;
926936
continue;
927937
}

‎numpy/core/tests/test_regression.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,19 +1239,6 @@ def test_array_ndmin_overflow(self):
12391239
"Ticket #947."
12401240
self.assertRaises(ValueError, lambda: np.array([1], ndmin=33))
12411241

1242-
def test_errobj_reference_leak(self, level=rlevel):
1243-
# Ticket #955
1244-
with np.errstate(all="ignore"):
1245-
z = int(0)
1246-
p = np.int32(-1)
1247-
1248-
gc.collect()
1249-
n_before = len(gc.get_objects())
1250-
z**p # this shouldn't leak a reference to errobj
1251-
gc.collect()
1252-
n_after = len(gc.get_objects())
1253-
assert_(n_before >= n_after, (n_before, n_after))
1254-
12551242
def test_void_scalar_with_titles(self, level=rlevel):
12561243
# No ticket
12571244
data = [('john', 4), ('mary', 5)]

‎numpy/core/tests/test_umath.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,15 @@ def test_integer_power_with_zero_exponent(self):
434434
arr = np.arange(-10, 10)
435435
assert_equal(np.power(arr, 0), np.ones_like(arr))
436436

437+
def test_integer_zero_to_negative_power(self):
438+
dtypes = ['i1', 'i2', 'i4', 'i8']
439+
for dt in dtypes:
440+
a = np.array([0, 1, 2, 3], dtype=dt)
441+
barray = np.array([0, 1, 2, -3], dtype=dt)
442+
bscalar = barray[-1]
443+
assert_raises(ZeroDivisionError, np.power, a[:, None], barray)
444+
assert_raises(ZeroDivisionError, np.power, a, bscalar)
445+
437446

438447
class TestLog2(TestCase):
439448
def test_log2_values(self):

0 commit comments

Comments
 (0)