diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-09-12 05:56:28 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-09-12 05:56:28 (GMT) |
| commit | b5651edaf12d0e3320c2a73ed9a6c4aaec7557d8 (patch) | |
| tree | 82d5ce790f9e88dc12f438d5dd310548b258e9c4 | |
| parent | fa7d3b13a36ec0ed72aa2d838299ceb8bc5eedca (diff) | |
| parent | b4055f294e51ae11bc93ad794e9fe2fab3e66aa2 (diff) | |
| download | cpython-b5651edaf12d0e3320c2a73ed9a6c4aaec7557d8.zip cpython-b5651edaf12d0e3320c2a73ed9a6c4aaec7557d8.tar.gz cpython-b5651edaf12d0e3320c2a73ed9a6c4aaec7557d8.tar.bz2 | |
Automated merge with ssh://hg.python.org/cpython
| -rw-r--r-- | Lib/random.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/random.py b/Lib/random.py index 2323325..e63e94f 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -257,9 +257,16 @@ class Random(_random.Random): 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 |