cpython: 1398dfb59fd9 (original) (raw)

Mercurial > cpython

changeset 85666:1398dfb59fd9

Removing the merge conflict markers. - my previous removal and hg resolve mark had still left them and hooks did not catch it too!

Senthil Kumaran senthil@uthcode.com
date Thu, 12 Sep 2013 07:06:49 -0700
parents 51c252f69a68
children 66ec8431032d
files Lib/random.py
diffstat 1 files changed, 0 insertions(+), 5 deletions(-)[+] [-] Lib/random.py 5

line wrap: on

line diff

--- a/Lib/random.py +++ b/Lib/random.py @@ -257,16 +257,11 @@ 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. -=======

Do not supply the 'int' argument. ->>>>>>> other """ randbelow = self._randbelow