summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornjsmith <njs@pobox.com>2013-01-04 05:18:59 -0800
committernjsmith <njs@pobox.com>2013-01-04 05:18:59 -0800
commit5701c87a8ffdc90dcae3dad642a494500fab9978 (patch)
tree0bcdd37b48971a24246bca0a5bcbc04f30c944f4
parentcce1c45afa3d821c5ca313f06b2481e55c98a238 (diff)
parent1899991549a318e508b3b0ba9f376ecd8d1ccdde (diff)
downloadnumpy-5701c87a8ffdc90dcae3dad642a494500fab9978.tar.gz
Merge pull request #2884 from Juanlu001/patch-1
Fixed choice docstring, wrong default size
-rw-r--r--numpy/random/mtrand/mtrand.pyx2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx
index ed9b5273b..f115dccdd 100644
--- a/numpy/random/mtrand/mtrand.pyx
+++ b/numpy/random/mtrand/mtrand.pyx
@@ -918,7 +918,7 @@ cdef class RandomState:
def choice(self, a, size=None, replace=True, p=None):
"""
- choice(a, size=1, replace=True, p=None)
+ choice(a, size=None, replace=True, p=None)
Generates a random sample from a given 1-D array