[Python-checkins] cpython (merge 3.4 -> default): merge

raymond.hettinger python-checkins at python.org
Wed Apr 2 09:59:20 CEST 2014


http://hg.python.org/cpython/rev/2a41d3f81b46
changeset:   90105:2a41d3f81b46
parent:      90103:1effaabe739b
parent:      90104:8e7fe184acfb
user:        Raymond Hettinger <python at rcn.com>
date:        Wed Apr 02 00:59:11 2014 -0700
summary:
  merge

files:
  Doc/library/functions.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -773,7 +773,7 @@
    already arranged into argument tuples, see :func:`itertools.starmap`\.
 
 
-.. function:: max(iterable, *[, default, key])
+.. function:: max(iterable, *[, key, default])
               max(arg1, arg2, *args[, key])
 
    Return the largest item in an iterable or the largest of two or more
@@ -807,7 +807,7 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable, *[, default, key])
+.. function:: min(iterable, *[, key, default])
               min(arg1, arg2, *args[, key])
 
    Return the smallest item in an iterable or the smallest of two or more

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list