Merge pull request #78 from rmcgibbo/minmax

Improvements to builtins min/max
This commit is contained in:
Guido van Rossum
2016-02-03 17:18:19 -08:00
2 changed files with 6 additions and 6 deletions

View File

@@ -677,12 +677,12 @@ def map(func: Callable[[_T1, _T2], _S],
iter1: Iterable[_T1],
iter2: Iterable[_T2]) -> List[_S]: ... # TODO more than two iterables
@overload
def max(arg1: _T, arg2: _T, *args: _T) -> _T: ...
def max(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = None) -> _T: ...
@overload
def max(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ...
# TODO memoryview
@overload
def min(arg1: _T, arg2: _T, *args: _T) -> _T: ...
def min(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = None) -> _T: ...
@overload
def min(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ...
@overload

View File

@@ -658,14 +658,14 @@ 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(arg1: _T, arg2: _T, *args: _T) -> _T: ...
def max(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = None) -> _T: ...
@overload
def max(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ...
def max(iterable: Iterable[_T], key: Callable[[_T], Any] = None, default:_T = None) -> _T: ...
# TODO memoryview
@overload
def min(arg1: _T, arg2: _T, *args: _T) -> _T: ...
def min(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = None) -> _T: ...
@overload
def min(iterable: Iterable[_T], key: Callable[[_T], Any] = None) -> _T: ...
def min(iterable: Iterable[_T], key: Callable[[_T], Any] = None, default:_T = None) -> _T: ...
@overload
def next(i: Iterator[_T]) -> _T: ...
@overload