From 1018fad6a4df3d7fcb0ec715867069044428a759 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 24 Nov 2016 23:31:59 +0100 Subject: Issue #28792: Remove aliases from _bisect Remove aliases from the C module. Always implement bisect() and insort() aliases in bisect.py Remove also the "# backward compatibility" command, there is no plan to deprecate nor remove these aliases. When keys are equal, it makes sense to use bisect.bisect() and bisect.insort(). --- Lib/bisect.py | 8 ++++---- Modules/_bisectmodule.c | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Lib/bisect.py b/Lib/bisect.py index 4a4d052..7732c63 100644 --- a/Lib/bisect.py +++ b/Lib/bisect.py @@ -19,8 +19,6 @@ def insort_right(a, x, lo=0, hi=None): else: lo = mid+1 a.insert(lo, x) -insort = insort_right # backward compatibility - def bisect_right(a, x, lo=0, hi=None): """Return the index where to insert item x in list a, assuming a is sorted. @@ -42,8 +40,6 @@ def bisect_right(a, x, lo=0, hi=None): else: lo = mid+1 return lo -bisect = bisect_right # backward compatibility - def insort_left(a, x, lo=0, hi=None): """Insert item x in list a, and keep it sorted assuming a is sorted. @@ -90,3 +86,7 @@ try: from _bisect import * except ImportError: pass + +# Create aliases +bisect = bisect_right +insort = insort_right diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c index 22ddbf2..831e10a 100644 --- a/Modules/_bisectmodule.c +++ b/Modules/_bisectmodule.c @@ -216,18 +216,11 @@ If x is already in a, insert it to the left of the leftmost x.\n\ Optional args lo (default 0) and hi (default len(a)) bound the\n\ slice of a to be searched.\n"); -PyDoc_STRVAR(bisect_doc, "Alias for bisect_right().\n"); -PyDoc_STRVAR(insort_doc, "Alias for insort_right().\n"); - static PyMethodDef bisect_methods[] = { {"bisect_right", (PyCFunction)bisect_right, METH_VARARGS|METH_KEYWORDS, bisect_right_doc}, - {"bisect", (PyCFunction)bisect_right, - METH_VARARGS|METH_KEYWORDS, bisect_doc}, {"insort_right", (PyCFunction)insort_right, METH_VARARGS|METH_KEYWORDS, insort_right_doc}, - {"insort", (PyCFunction)insort_right, - METH_VARARGS|METH_KEYWORDS, insort_doc}, {"bisect_left", (PyCFunction)bisect_left, METH_VARARGS|METH_KEYWORDS, bisect_left_doc}, {"insort_left", (PyCFunction)insort_left, -- cgit v0.12