[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[andrew.kuchling]

http://hg.python.org/cpython/rev/0898e173ebe0
changeset:   84264:0898e173ebe0
parent:      84261:1d67c0893719
parent:      84263:7ecca1a98220
user:        Andrew Kuchling <amk at amk.ca>
date:        Sat Jun 22 19:27:59 2013 -0400
summary:
  Merge from 3.3

files:
  Modules/itertoolsmodule.c |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -1554,7 +1554,8 @@
 };
 
 PyDoc_STRVAR(islice_doc,
-"islice(iterable, [start,] stop [, step]) --> islice object\n\
+"islice(iterable, stop) --> islice object\n\
+islice(iterable, start, stop[, step]) --> islice object\n\
 \n\
 Return an iterator whose next() method returns selected values from an\n\
 iterable.  If start is specified, will skip all preceding elements;\n\
@@ -2229,7 +2230,7 @@
 };
 
 PyDoc_STRVAR(product_doc,
-"product(*iterables) --> product object\n\
+"product(*iterables, repeat=1) --> product object\n\
 \n\
 Cartesian product of input iterables.  Equivalent to nested for-loops.\n\n\
 For example, product(A, B) returns the same as:  ((x,y) for x in A for y in B).\n\

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