merge from 3.3

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

diff --cc Lib/random.py
index 2323325a4fe304b7ff6e899d3119290d226baa1e,5876766a6126fa2325cb879571ddda8cb0b46c95..e63e94f065115f04ebd6e78370f716986dc7ee16
--- 1/Lib/random.py
--- 2/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