From 9f1e90b33f84daf788abb92fff646e55551fe8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Rousset?= Date: Wed, 24 Aug 2016 15:07:40 +0200 Subject: [PATCH] Merge bisect (#468) * merge bisect * comment while mypy#2035 --- stdlib/2.7/bisect.pyi | 6 ------ stdlib/2and3/bisect.pyi | 22 ++++++++++++++++++++++ stdlib/3/bisect.pyi | 12 ------------ 3 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 stdlib/2.7/bisect.pyi create mode 100644 stdlib/2and3/bisect.pyi delete mode 100644 stdlib/3/bisect.pyi diff --git a/stdlib/2.7/bisect.pyi b/stdlib/2.7/bisect.pyi deleted file mode 100644 index 5d3f2e511..000000000 --- a/stdlib/2.7/bisect.pyi +++ /dev/null @@ -1,6 +0,0 @@ -def bisect(a: list, x: object, lo: int = ..., hi: int = ...) -> int: ... -def bisect_left(a: list, x: object, lo: int = ..., hi: int = ...) -> int: ... -def bisect_right(a: list, x: object, lo: int = ..., hi: int = ...) -> int: ... -def insort_left(a: list, x: object, lo: int = ..., hi: int = ...) -> int: ... -def insort_right(a: list, x: object, lo: int = ..., hi: int = ...) -> int: ... -def insort(a: list, x: object, lo: int = ..., hi: int = ...) -> int: ... diff --git a/stdlib/2and3/bisect.pyi b/stdlib/2and3/bisect.pyi new file mode 100644 index 000000000..51ffc9b50 --- /dev/null +++ b/stdlib/2and3/bisect.pyi @@ -0,0 +1,22 @@ +# Stubs for bisect + +from typing import Any, Sequence, TypeVar + +_T = TypeVar('_T') + +# TODO uncomment when mypy#2035 is fixed +#def bisect_left(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...) -> int: ... +#def bisect_right(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...) -> int: ... +#def bisect(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...) -> int: ... +# +#def insort_left(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...) -> int: ... +#def insort_right(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...) -> int: ... +#def insort(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...) -> int: ... + +def bisect_left(a: Sequence, x: Any, lo: int = ..., hi: int = ...) -> int: ... +def bisect_right(a: Sequence, x: Any, lo: int = ..., hi: int = ...) -> int: ... +def bisect(a: Sequence, x: Any, lo: int = ..., hi: int = ...) -> int: ... + +def insort_left(a: Sequence, x: Any, lo: int = ..., hi: int = ...) -> int: ... +def insort_right(a: Sequence, x: Any, lo: int = ..., hi: int = ...) -> int: ... +def insort(a: Sequence, x: Any, lo: int = ..., hi: int = ...) -> int: ... diff --git a/stdlib/3/bisect.pyi b/stdlib/3/bisect.pyi deleted file mode 100644 index 954cd70fb..000000000 --- a/stdlib/3/bisect.pyi +++ /dev/null @@ -1,12 +0,0 @@ -from typing import Sequence, TypeVar - -_T = TypeVar('_T') - -def insort_left(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...): pass -def insort_right(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...): pass - -def bisect_left(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...): pass -def bisect_right(a: Sequence[_T], x: _T, lo: int = ..., hi: int = ...): pass - -insort = insort_right -bisect = bisect_right