changeset: 85662:15096b93ae5a
parent: 85655:377bd6e0f61c
parent: 85661:4782faf29480
user: Senthil Kumaran <senthil@uthcode.com>
date: Wed Sep 11 22:55:54 2013 -0700
files: Lib/random.py
description:
merge from 3.3
Improve the docstring of random.shuffle. Inform users not to provide int arg.
Addresses issue #14927
diff -r 377bd6e0f61c -r 15096b93ae5a Lib/random.py
--- a/Lib/random.py	Mon Sep 09 22:40:13 2013 -0700
+++ b/Lib/random.py	Wed Sep 11 22:55:54 2013 -0700
@@ -257,9 +257,16 @@
 def shuffle(self, x, random=None, int=int):
 """Shuffle list x in place, and return None.
 
+<<<<<<< local Optional argument random is a 0-argument function returning a random float in [0.0, 1.0); if it is the default None, the standard random.random will be used. +======= + Optional arg random is a 0-argument function returning a random + float in [0.0, 1.0); by default, the standard random.random. + + Do not supply the 'int' argument. +>>>>>>> other
 """
 
 randbelow = self._randbelow
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/15096b93ae5a">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/15096b93ae5a" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>