diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/random/mtrand/mtrand.pyx | 2 | ||||
| -rw-r--r-- | numpy/random/tests/test_random.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx index b8de228cd..ec759fdfb 100644 --- a/numpy/random/mtrand/mtrand.pyx +++ b/numpy/random/mtrand/mtrand.pyx @@ -1122,7 +1122,7 @@ cdef class RandomState: else: pop_size = a.shape[0] if pop_size is 0 and np.prod(size) != 0: - raise ValueError("a cannot be empty unless no samples are taken") + raise ValueError("'a' cannot be empty unless no samples are taken") if p is not None: d = len(p) diff --git a/numpy/random/tests/test_random.py b/numpy/random/tests/test_random.py index a099f7be6..2e0885024 100644 --- a/numpy/random/tests/test_random.py +++ b/numpy/random/tests/test_random.py @@ -441,10 +441,11 @@ class TestRandomDist(object): assert_equal(np.random.choice(np.arange(6), s, replace=True).shape, s) # Check zero-size - assert_equal(np.random.randint(0,0,(3,0,4)).shape, (3,0,4)) - assert_equal(np.random.randint(0,-10,0).shape, (0,)) - assert_equal(np.random.choice(0,0).shape, (0,)) - assert_equal(np.random.choice([],(0,)).shape, (0,)) + assert_equal(np.random.randint(0, 0, size=(3, 0, 4)).shape, (3, 0, 4)) + assert_equal(np.random.randint(0, -10, size=0).shape, (0,)) + assert_equal(np.random.randint(10, 10, size=0).shape, (0,)) + assert_equal(np.random.choice(0, size=0).shape, (0,)) + assert_equal(np.random.choice([], size=(0,)).shape, (0,)) assert_equal(np.random.choice(['a', 'b'], size=(3, 0, 4)).shape, (3, 0, 4)) assert_raises(ValueError, np.random.choice, [], 10) |