Bug #1653736: Properly discard third argument to slot_nb_inplace_power.

Will backport.

diff --git a/Misc/NEWS b/Misc/NEWS
index 25b72c2f03fc3d789108d510ead76019ff0ec680..faf7d2d2b09bbf3efea8d09ff6b8318d949ab67f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
+
 - PEP 352: Raising a string exception now triggers a TypeError.  Attempting to
   catch a string exception raises DeprecationWarning.
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 6ea489af2cca75b3cbd4e17edc2d464024ab1ca0..20b530c4343921b7d88d7475e41e309438a2a8f2 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4427,7 +4427,13 @@ SLOT1(slot_nb_inplace_subtract, "__isub__", PyObject *, "O")
 SLOT1(slot_nb_inplace_multiply, "__imul__", PyObject *, "O")
 SLOT1(slot_nb_inplace_divide, "__idiv__", PyObject *, "O")
 SLOT1(slot_nb_inplace_remainder, "__imod__", PyObject *, "O")
-SLOT1(slot_nb_inplace_power, "__ipow__", PyObject *, "O")
+/* Can't use SLOT1 here, because nb_inplace_power is ternary */
+static PyObject * 
+slot_nb_inplace_power(PyObject *self, PyObject * arg1, PyObject *arg2) 
+{ 
+  static PyObject *cache_str; 
+  return call_method(self, "__ipow__", &cache_str, "(" "O" ")", arg1); 
+}
 SLOT1(slot_nb_inplace_lshift, "__ilshift__", PyObject *, "O")
 SLOT1(slot_nb_inplace_rshift, "__irshift__", PyObject *, "O")
 SLOT1(slot_nb_inplace_and, "__iand__", PyObject *, "O")