Merged revisions 65259,65263,65296,65307,65321 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65259 | benjamin.peterson | 2008-07-27 10:22:14 -0500 (Sun, 27 Jul 2008) | 1 line

  clarify Popen argument
........
  r65263 | andrew.kuchling | 2008-07-28 12:04:48 -0500 (Mon, 28 Jul 2008) | 1 line

  Clarify wording
........
  r65296 | raymond.hettinger | 2008-07-30 02:27:30 -0500 (Wed, 30 Jul 2008) | 1 line

  Neaten-up the itertools recipes.
........
  r65307 | benjamin.peterson | 2008-07-30 08:46:53 -0500 (Wed, 30 Jul 2008) | 1 line

  getrandombits is actually getrandbits
........
  r65321 | raymond.hettinger | 2008-07-30 20:19:50 -0500 (Wed, 30 Jul 2008) | 4 lines

  Alter recipe to show how to call izip_longest() with
  both a keyword argument and star arguments.
........
This commit is contained in:
Benjamin Peterson 2008-07-31 20:21:46 +00:00
parent f17ff4e1d6
commit d18de0e28b
5 changed files with 8 additions and 9 deletions

View File

@ -566,8 +566,7 @@ which incur interpreter overhead.
def grouper(n, iterable, fillvalue=None):
"grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
args = [iter(iterable)] * n
kwds = dict(fillvalue=fillvalue)
return zip_longest(*args, **kwds)
return zip_longest(fillvalue=fillvalue, *args)
def roundrobin(*iterables):
"roundrobin('ABC', 'D', 'EF') --> A D E B F C"

View File

@ -33,7 +33,7 @@ instances of :class:`Random` to get generators that don't share state.
Class :class:`Random` can also be subclassed if you want to use a different
basic generator of your own devising: in that case, override the :meth:`random`,
:meth:`seed`, :meth:`getstate`, and :meth:`setstate`.
Optionally, a new generator can supply a :meth:`getrandombits` method --- this
Optionally, a new generator can supply a :meth:`getrandbits` method --- this
allows :meth:`randrange` to produce selections over an arbitrarily large range.

View File

@ -33,9 +33,10 @@ This module defines one class called :class:`Popen`:
Arguments are:
*args* should be a string, or a sequence of program arguments. The program to
execute is normally the first item in the args sequence or string, but can be
explicitly set by using the executable argument.
*args* should be a string, or a sequence of program arguments. The program
to execute is normally the first item in the args sequence or the string if a
string is given, but can be explicitly set by using the *executable*
argument.
On Unix, with *shell=False* (default): In this case, the Popen class uses
:meth:`os.execvp` to execute the child program. *args* should normally be a

View File

@ -74,7 +74,7 @@ class Random(_random.Random):
Class Random can also be subclassed if you want to use a different basic
generator of your own devising: in that case, override the following
methods: random(), seed(), getstate(), and setstate().
Optionally, implement a getrandombits() method so that randrange()
Optionally, implement a getrandbits() method so that randrange()
can cover arbitrarily large ranges.
"""

View File

@ -1257,8 +1257,7 @@ Samuele
>>> def grouper(n, iterable, fillvalue=None):
... "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
... args = [iter(iterable)] * n
... kwds = dict(fillvalue=fillvalue)
... return zip_longest(*args, **kwds)
... return zip_longest(fillvalue=fillvalue, *args)
>>> def roundrobin(*iterables):
... "roundrobin('ABC', 'D', 'EF') --> A D E B F C"