fixes from review

mattip · mattip · commit 9013b0f60d9b · 2018-06-21T09:36:05.000-07:00
diff --git a/doc/release/1.16.0-notes.rst b/doc/release/1.16.0-notes.rst
@@ -39,7 +39,7 @@ Improvements
 Even when no elements needed to be drawn, ``np.random.randint`` and
 ``np.random.choice`` raised an error when the arguments described an empty
 distribution. This has been fixed so that e.g.
-``np.random.choice([],0) == np.array([],dtype=float64)``.
+``np.random.choice([], 0) == np.array([], dtype=float64)``.
 
 Changes
 =======
diff --git 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
@@ -441,10 +441,11 @@ def test_choice_return_shape(self):
         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)
 
