Skip to content

Commit f236760

Browse files
ewmoorecharris
authored andcommitted
BUG: integer 0 to a negative power should error.
Fixes numpygh-7510.
1 parent b0159a9 commit f236760

3 files changed

Lines changed: 19 additions & 14 deletions

File tree

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,16 @@ NPY_NO_EXPORT void
967967
*((@type@ *)op1) = 1;
968968
continue;
969969
}
970-
if (in2 < 0 || in1 == 0) {
970+
if (in1 == 0 && in2 < 0) {
971+
NPY_ALLOW_C_API_DEF
972+
NPY_ALLOW_C_API;
973+
PyErr_SetString(PyExc_ZeroDivisionError,
974+
"0 cannot be raised to a negative power.");
975+
NPY_DISABLE_C_API;
976+
return;
977+
}
978+
979+
if (in2 < 0) {
971980
*((@type@ *)op1) = 0;
972981
continue;
973982
}

‎numpy/core/tests/test_regression.py‎

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

1245-
def test_errobj_reference_leak(self, level=rlevel):
1246-
# Ticket #955
1247-
with np.errstate(all="ignore"):
1248-
z = int(0)
1249-
p = np.int32(-1)
1250-
1251-
gc.collect()
1252-
n_before = len(gc.get_objects())
1253-
z**p # this shouldn't leak a reference to errobj
1254-
gc.collect()
1255-
n_after = len(gc.get_objects())
1256-
assert_(n_before >= n_after, (n_before, n_after))
1257-
12581245
def test_void_scalar_with_titles(self, level=rlevel):
12591246
# No ticket
12601247
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
@@ -437,6 +437,15 @@ def test_integer_power_of_1(self):
437437
arr = np.arange(-10, 10)
438438
assert_equal(np.power(1, arr), np.ones_like(arr))
439439

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

441450
class TestLog2(TestCase):
442451
def test_log2_values(self):

0 commit comments

Comments
 (0)