From: Raymond Hettinger <python@rcn.com>
Date: Mon, 19 May 2014 21:20:52 +0000 (+0100)
Subject: Issue 20620: Update the min()/max() docs for the new default argument.
X-Git-Tag: v3.4.2rc1~522
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a54582d72e50ae809938122212391157ec773e9;p=thirdparty%2FPython%2Fcpython.git

Issue 20620: Update the min()/max() docs for the new default argument.

Patch provided by Berker Peksag.
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 8d1255ecac57..d351cd02819d 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1454,10 +1454,12 @@ builtin_min(PyObject *self, PyObject *args, PyObject *kwds)
 }
 
 PyDoc_STRVAR(min_doc,
-"min(iterable[, key=func]) -> value\n\
-min(a, b, c, ...[, key=func]) -> value\n\
+"min(iterable, *[, default=obj, key=func]) -> value\n\
+min(arg1, arg2, *args, *[, key=func]) -> value\n\
 \n\
-With a single iterable argument, return its smallest item.\n\
+With a single iterable argument, return its smallest item. The\n\
+default keyword-only argument specifies an object to return if\n\
+the provided iterable is empty.\n\
 With two or more arguments, return the smallest argument.");
 
 
@@ -1468,10 +1470,12 @@ builtin_max(PyObject *self, PyObject *args, PyObject *kwds)
 }
 
 PyDoc_STRVAR(max_doc,
-"max(iterable[, key=func]) -> value\n\
-max(a, b, c, ...[, key=func]) -> value\n\
+"max(iterable, *[, default=obj, key=func]) -> value\n\
+max(arg1, arg2, *args, *[, key=func]) -> value\n\
 \n\
-With a single iterable argument, return its largest item.\n\
+With a single iterable argument, return its biggest item. The\n\
+default keyword-only argument specifies an object to return if\n\
+the provided iterable is empty.\n\
 With two or more arguments, return the largest argument.");