From 546ab67b5ac49149e3e26ec4e2a319ce72b09daf Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Thu, 25 Nov 2021 00:29:49 +0900 Subject: [PATCH 1/2] bpo-45760: Remove PyNumber_InMatrixMultiply --- Objects/abstract.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c index 82599dd6eca23c..ac9f9135b05ee5 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1248,7 +1248,7 @@ INPLACE_BINOP(PyNumber_InPlaceAnd, nb_inplace_and, nb_and, "&=") INPLACE_BINOP(PyNumber_InPlaceLshift, nb_inplace_lshift, nb_lshift, "<<=") INPLACE_BINOP(PyNumber_InPlaceRshift, nb_inplace_rshift, nb_rshift, ">>=") INPLACE_BINOP(PyNumber_InPlaceSubtract, nb_inplace_subtract, nb_subtract, "-=") -INPLACE_BINOP(PyNumber_InMatrixMultiply, nb_inplace_matrix_multiply, nb_matrix_multiply, "@=") +INPLACE_BINOP(PyNumber_InPlaceMatrixMultiply, nb_inplace_matrix_multiply, nb_matrix_multiply, "@=") PyObject * PyNumber_InPlaceFloorDivide(PyObject *v, PyObject *w) @@ -1316,13 +1316,6 @@ PyNumber_InPlaceMultiply(PyObject *v, PyObject *w) return result; } -PyObject * -PyNumber_InPlaceMatrixMultiply(PyObject *v, PyObject *w) -{ - return binary_iop(v, w, NB_SLOT(nb_inplace_matrix_multiply), - NB_SLOT(nb_matrix_multiply), "@="); -} - PyObject * PyNumber_InPlaceRemainder(PyObject *v, PyObject *w) { From 4b0bdbefc730a6f4cd648ce650d330167251c500 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Thu, 25 Nov 2021 00:35:07 +0900 Subject: [PATCH 2/2] bpo-45760: Update --- Objects/abstract.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c index ac9f9135b05ee5..5c533bf03292de 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1249,20 +1249,9 @@ INPLACE_BINOP(PyNumber_InPlaceLshift, nb_inplace_lshift, nb_lshift, "<<=") INPLACE_BINOP(PyNumber_InPlaceRshift, nb_inplace_rshift, nb_rshift, ">>=") INPLACE_BINOP(PyNumber_InPlaceSubtract, nb_inplace_subtract, nb_subtract, "-=") INPLACE_BINOP(PyNumber_InPlaceMatrixMultiply, nb_inplace_matrix_multiply, nb_matrix_multiply, "@=") - -PyObject * -PyNumber_InPlaceFloorDivide(PyObject *v, PyObject *w) -{ - return binary_iop(v, w, NB_SLOT(nb_inplace_floor_divide), - NB_SLOT(nb_floor_divide), "//="); -} - -PyObject * -PyNumber_InPlaceTrueDivide(PyObject *v, PyObject *w) -{ - return binary_iop(v, w, NB_SLOT(nb_inplace_true_divide), - NB_SLOT(nb_true_divide), "/="); -} +INPLACE_BINOP(PyNumber_InPlaceFloorDivide, nb_inplace_floor_divide, nb_floor_divide, "//=") +INPLACE_BINOP(PyNumber_InPlaceTrueDivide, nb_inplace_true_divide, nb_true_divide, "/=") +INPLACE_BINOP(PyNumber_InPlaceRemainder, nb_inplace_remainder, nb_remainder, "%=") PyObject * PyNumber_InPlaceAdd(PyObject *v, PyObject *w) @@ -1316,13 +1305,6 @@ PyNumber_InPlaceMultiply(PyObject *v, PyObject *w) return result; } -PyObject * -PyNumber_InPlaceRemainder(PyObject *v, PyObject *w) -{ - return binary_iop(v, w, NB_SLOT(nb_inplace_remainder), - NB_SLOT(nb_remainder), "%="); -} - PyObject * PyNumber_InPlacePower(PyObject *v, PyObject *w, PyObject *z) {