Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion Lib/test/test_capi/test_number.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,9 @@ def test_misc_multiply(self):
self.assertRaises(MemoryError, inplacemultiply, [1, 2], PY_SSIZE_T_MAX//2 + 1)

def test_misc_power(self):
# PyNumber_Power()
# PyNumber_Power(), PyNumber_InPlacePower()
power = _testcapi.number_power
inplacepower = _testcapi.number_inplacepower

class HasPow(WithDunder):
methname = '__pow__'
Expand All @@ -216,6 +217,39 @@ class HasPow(WithDunder):
self.assertRaises(TypeError, power, 4, 11, 1.25)
self.assertRaises(TypeError, power, 4, 11, HasPow.with_val(NotImplemented))
self.assertRaises(TypeError, power, 4, 11, object())
self.assertEqual(inplacepower(4, 11, 5), pow(4, 11, 5))
self.assertRaises(TypeError, inplacepower, 4, 11, 1.25)
self.assertRaises(TypeError, inplacepower, 4, 11, object())

class X:
def __pow__(*args):
return args

x = X()
self.assertEqual(power(x, 11), (x, 11))
self.assertEqual(inplacepower(x, 11), (x, 11))
self.assertEqual(power(x, 11, 5), (x, 11, 5))
self.assertEqual(inplacepower(x, 11, 5), (x, 11, 5))

class X:
def __rpow__(*args):
return args

x = X()
self.assertEqual(power(4, x), (x, 4))
self.assertEqual(inplacepower(4, x), (x, 4))
# XXX: Three-arg power doesn't use __rpow__.
self.assertRaises(TypeError, power, 4, x, 5)
self.assertRaises(TypeError, inplacepower, 4, x, 5)

class X:
def __ipow__(*args):
return args

x = X()
self.assertEqual(inplacepower(x, 11), (x, 11))
# XXX: In-place power doesn't pass the third arg to __ipow__.
self.assertEqual(inplacepower(x, 11, 5), (x, 11))

def test_long(self):
# Test PyNumber_Long()
Expand Down
10 changes: 8 additions & 2 deletions Objects/typeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -9906,8 +9906,14 @@ SLOT1(slot_nb_inplace_remainder, __imod__, PyObject *)
static PyObject *
slot_nb_inplace_power(PyObject *self, PyObject * arg1, PyObject *arg2)
{
PyObject *stack[2] = {self, arg1};
return vectorcall_method(&_Py_ID(__ipow__), stack, 2);
if (1||arg2 == Py_None) {
PyObject *stack[2] = {self, arg1};
return vectorcall_method(&_Py_ID(__ipow__), stack, 2);
}
else {
PyObject *stack[3] = {self, arg1, arg2};
return vectorcall_method(&_Py_ID(__ipow__), stack, 3);
}
}
SLOT1(slot_nb_inplace_lshift, __ilshift__, PyObject *)
SLOT1(slot_nb_inplace_rshift, __irshift__, PyObject *)
Expand Down
Loading