[Python-checkins] cpython (merge default -> default): Automated merge with ssh://hg.python.org/cpython

[senthil.kumaran]

http://hg.python.org/cpython/rev/51c252f69a68
changeset:   85663:51c252f69a68
parent:      85658:7d38784092d8
parent:      85662:15096b93ae5a
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Sep 11 22:56:28 2013 -0700
summary:
  Automated merge with ssh://hg.python.org/cpython

files:
  Lib/random.py |  7 +++++++
  1 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Lib/random.py b/Lib/random.py
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -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

-- 
Repository URL: http://hg.python.org/cpython