diff options
author | Benjamin Peterson <benjamin@python.org> | 2008-07-31 20:21:46 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2008-07-31 20:21:46 (GMT) |
commit | d18de0e28b843e5edee3a9ea1eaa02569a201774 (patch) | |
tree | 02799e34032359a30c62f43b0458551dfb1c0d6c /Lib | |
parent | f17ff4e1d675bdf84676021d2c444e0ba002aa5c (diff) | |
download | cpython-d18de0e28b843e5edee3a9ea1eaa02569a201774.zip cpython-d18de0e28b843e5edee3a9ea1eaa02569a201774.tar.gz cpython-d18de0e28b843e5edee3a9ea1eaa02569a201774.tar.bz2 |
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.
........
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/random.py | 2 | ||||
-rw-r--r-- | Lib/test/test_itertools.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/random.py b/Lib/random.py index e0c015d..70603ca 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -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. """ diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py index 8c482c5..a0d45e3 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -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" |