FIX: Changed named to choice, reverted other changes.

1 files changed, 6 insertions, 1 deletions

diff --git a/numpy/random/__init__.py b/numpy/random/__init__.py
index 24ce0dd5d..73b5fdabc 100644
--- a/numpy/random/__init__.py
+++ b/numpy/random/__init__.py
@@ -10,7 +10,10 @@ random               Uniformly distributed values of a given shape.
 bytes                Uniformly distributed random bytes.
 random_integers      Uniformly distributed integers in a given range.
 random_sample        Uniformly distributed floats in a given range.
-sample               Generate a weighted random sample from a given array-like
+random               Alias for random_sample
+ranf                 Alias for random_sample
+sample               Alias for random_sample
+choice               Generate a weighted random sample from a given array-like
 permutation          Randomly permute a sequence / generate a random sequence.
 shuffle              Randomly permute a sequence in place.
 seed                 Seed the random number generator.
@@ -88,6 +91,8 @@ from info import __doc__, __all__
 from mtrand import *
 
 # Some aliases:
+ranf = random = sample = random_sample
+__all__.extend(['ranf','random','sample'])
 
 def __RandomState_ctor():
     """Return a RandomState instance.