[Python-3000-checkins] r65337 - in python/branches/py3k: Doc/library/itertools.rst Doc/library/random.rst Doc/library/subprocess.rst Lib/random.py Lib/test/test_itertools.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jul 31 22:21:46 2008
New Revision: 65337

Log:
Merged revisions 65259,65263,65296,65307,65321 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/library/itertools.rst
python/branches/py3k/Doc/library/random.rst
python/branches/py3k/Doc/library/subprocess.rst
python/branches/py3k/Lib/random.py
python/branches/py3k/Lib/test/test_itertools.py

Modified: python/branches/py3k/Doc/library/itertools.rst
==============================================================================
--- python/branches/py3k/Doc/library/itertools.rst (original)
+++ python/branches/py3k/Doc/library/itertools.rst Thu Jul 31 22:21:46 2008
@@ -566,8 +566,7 @@
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"

Modified: python/branches/py3k/Doc/library/random.rst
==============================================================================
--- python/branches/py3k/Doc/library/random.rst (original)
+++ python/branches/py3k/Doc/library/random.rst Thu Jul 31 22:21:46 2008
@@ -33,7 +33,7 @@
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.



Modified: python/branches/py3k/Doc/library/subprocess.rst
==============================================================================
--- python/branches/py3k/Doc/library/subprocess.rst (original)
+++ python/branches/py3k/Doc/library/subprocess.rst Thu Jul 31 22:21:46 2008
@@ -33,9 +33,10 @@

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

Modified: python/branches/py3k/Lib/random.py
==============================================================================
--- python/branches/py3k/Lib/random.py (original)
+++ python/branches/py3k/Lib/random.py Thu Jul 31 22:21:46 2008
@@ -74,7 +74,7 @@
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.

"""

Modified: python/branches/py3k/Lib/test/test_itertools.py
==============================================================================
--- python/branches/py3k/Lib/test/test_itertools.py (original)
+++ python/branches/py3k/Lib/test/test_itertools.py Thu Jul 31 22:21:46 2008
@@ -1257,8 +1257,7 @@
... "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)
... "roundrobin('ABC', 'D', 'EF') --> A D E B F C"