From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 12 Sep 2013 05:55:54 +0000 (-0700)
Subject: merge from 3.3
X-Git-Tag: v3.4.0a3~85^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4055f294e51ae11bc93ad794e9fe2fab3e66aa2;p=thirdparty%2FPython%2Fcpython.git

merge from 3.3

Improve the docstring of random.shuffle. Inform users not to provide int arg.
Addresses issue #14927
---

b4055f294e51ae11bc93ad794e9fe2fab3e66aa2
diff --cc Lib/random.py
index 2323325a4fe3,5876766a6126..e63e94f06511
--- a/Lib/random.py
+++ b/Lib/random.py
@@@ -255,11 -252,12 +255,18 @@@ class Random(_random.Random)
          return seq[i]
  
      def shuffle(self, x, random=None, int=int):
 -        """x, random=random.random -> shuffle list x in place; return None.
 +        """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