[Python-Dev] cpython (merge 3.3 -> default): merge from 3.3

[Antoine Pitrou]

On Thu, 12 Sep 2013 07:57:25 +0200 (CEST)
senthil.kumaran <python-checkins at python.org> wrote:
>  
> +<<<<<<< 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

Can you fix this?

Thanks

Antoine.