From ee8e8fcb69c3dad0283f2586dc01e476dcd5260d Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 6 Jan 2016 16:14:34 -0800 Subject: [PATCH] Swap max() and min() overloads so max(x, y) and min(x, y) work as expected. --- builtins/2.7/__builtin__.pyi | 8 ++++---- builtins/3/builtins.pyi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builtins/2.7/__builtin__.pyi b/builtins/2.7/__builtin__.pyi index 5631691cf..caf3e1991 100644 --- a/builtins/2.7/__builtin__.pyi +++ b/builtins/2.7/__builtin__.pyi @@ -660,15 +660,15 @@ def map(func: Callable[[_T1, _T2], _S], iter1: Iterable[_T1], iter2: Iterable[_T2]) -> List[_S]: ... # TODO more than two iterables @overload -def max(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ... -@overload def max(arg1: _T, arg2: _T, *args: _T) -> _T: ... +@overload +def max(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ... # TODO memoryview @overload -def min(iterable: Iterable[_T]) -> _T: ... -@overload def min(arg1: _T, arg2: _T, *args: _T) -> _T: ... @overload +def min(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ... +@overload def next(i: Iterator[_T]) -> _T: ... @overload def next(i: Iterator[_T], default: _T) -> _T: ... diff --git a/builtins/3/builtins.pyi b/builtins/3/builtins.pyi index 91356e35d..42a463a02 100644 --- a/builtins/3/builtins.pyi +++ b/builtins/3/builtins.pyi @@ -654,15 +654,15 @@ def map(func: Callable[[_T1], _S], iter1: Iterable[_T1]) -> Iterator[_S]: ... def map(func: Callable[[_T1, _T2], _S], iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[_S]: ... # TODO more than two iterables @overload -def max(iterable: Iterable[_T]) -> _T: ... # TODO keyword argument key -@overload def max(arg1: _T, arg2: _T, *args: _T) -> _T: ... +@overload +def max(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ... # TODO memoryview @overload -def min(iterable: Iterable[_T]) -> _T: ... -@overload def min(arg1: _T, arg2: _T, *args: _T) -> _T: ... @overload +def min(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ... +@overload def next(i: Iterator[_T]) -> _T: ... @overload def next(i: Iterator[_T], default: _T) -> _T: ...